diff --git a/roles/bbb_instance/tasks/main.yml b/roles/bbb_instance/tasks/main.yml index dd69b36d83442e8b59925edbdb5d5e7f086c2246..8a02f87d1f84e5fe3c73f99dbedfe938a0430814 100644 --- a/roles/bbb_instance/tasks/main.yml +++ b/roles/bbb_instance/tasks/main.yml @@ -2,3 +2,6 @@ - import_tasks: install.yml when: app_run in ['install', 'reinstall'] + +- import_role: + name: instance_prod diff --git a/roles/collabora_online_instance/tasks/main.yml b/roles/collabora_online_instance/tasks/main.yml index 77540f0b0e0b58195afa8b671f6f78d23fb75157..5a6321e5ebbc58c9df3e969ff1b071ee392f26fd 100644 --- a/roles/collabora_online_instance/tasks/main.yml +++ b/roles/collabora_online_instance/tasks/main.yml @@ -130,3 +130,6 @@ - import_role: name: _app_monit + +- import_role: + name: instance_prod diff --git a/roles/etherpad/tasks/main.yml b/roles/etherpad/tasks/main.yml index 27b0405f89581116c7a447fcaad19feffc5aeedf..071e73bf79fd78fb61b71b962a3f72efbcd6c5a3 100644 --- a/roles/etherpad/tasks/main.yml +++ b/roles/etherpad/tasks/main.yml @@ -3,4 +3,7 @@ when: app_run in ['install', 'reinstall', 'upgrade'] - import_tasks: uninstall.yml - when: app_run == 'uninstall' \ No newline at end of file + when: app_run == 'uninstall' + +- import_role: + name: instance_prod diff --git a/roles/framadate_instance/tasks/main.yml b/roles/framadate_instance/tasks/main.yml index 0dfe3710481f5c859f4be7f4e7dbc9978a009c9b..35ab376720bec931211cf516a7c4c8835624ca94 100644 --- a/roles/framadate_instance/tasks/main.yml +++ b/roles/framadate_instance/tasks/main.yml @@ -23,4 +23,7 @@ - name: "admin and password setting" command: "htpasswd -bc {{ app_instance_root }}/admin/.htpasswd {{ admin_user | quote }} {{ admin_password | quote }}" - when: app_run in ['install', 'reinstall'] \ No newline at end of file + when: app_run in ['install', 'reinstall'] + +- import_role: + name: instance_prod diff --git a/roles/garradin_instance/tasks/main.yml b/roles/garradin_instance/tasks/main.yml index ebf374295dec7a4982d7828d2db7da816f9a4774..e1d4729d882e634a6bc8b0755f9c8a2f5a06fde1 100644 --- a/roles/garradin_instance/tasks/main.yml +++ b/roles/garradin_instance/tasks/main.yml @@ -44,3 +44,5 @@ tags: - garradin_configure +- import_role: + name: instance_prod diff --git a/roles/gitlab/tasks/main.yml b/roles/gitlab/tasks/main.yml index 2cd8fdae757560d01ce1c2295e63a55667429b5f..2ff959dade46586a86be9d1ff248d486c28588ed 100644 --- a/roles/gitlab/tasks/main.yml +++ b/roles/gitlab/tasks/main.yml @@ -6,3 +6,6 @@ - import_tasks: uninstall.yml when: app_run == 'uninstall' + +- import_role: + name: instance_prod diff --git a/roles/humhub/tasks/main.yml b/roles/humhub/tasks/main.yml index e68deade829252ac3702e36a446c97c3b18ec6c7..9974a69fd263534627e50fb20ce5adead02c461a 100644 --- a/roles/humhub/tasks/main.yml +++ b/roles/humhub/tasks/main.yml @@ -7,4 +7,7 @@ # when: app_run == 'upgrade' - import_tasks: uninstall.yml - when: app_run == 'uninstall' \ No newline at end of file + when: app_run == 'uninstall' + +- import_role: + name: instance_prod diff --git a/roles/instance_prod/tasks/main.yml b/roles/instance_prod/tasks/main.yml new file mode 100644 index 0000000000000000000000000000000000000000..b4718363790c0cb838ef370c60fc71db525e050d --- /dev/null +++ b/roles/instance_prod/tasks/main.yml @@ -0,0 +1,20 @@ + +- name: Read-write git checkout repo + ansible.builtin.git: + repo: git@git.paquerette.eu:paquerette/infrastructure/infrastructure-p-querette.git + dest: /home/admin/instance_prod + +- name: add new instance in files + command: "/home/admin/instance_prod/infrastructure-p-querette/update_prod.sh add {{ role }} {{ app_domain }} {{ app_version }} {{ client }} + when: app_run in ['install', 'reinstall'] + +- name: add new instance in files + command: "/home/admin/instance_prod/infrastructure-p-querette/update_prod.sh update {{ role }} {{ app_domain }} {{ app_version }} {{ client }} + when: app_run in ['update'] + +- name: add new instance in files + command: "/home/admin/instance_prod/infrastructure-p-querette/update_prod.sh remove {{ role }} {{ app_domain }} {{ app_version }} {{ client }} + when: app_run in ['uninstall'] + +- name: commit file + command: "git commit -a -m '{{ app_run }} {{ role }} version {{ app_versio }} for client {{ client }}' " diff --git a/roles/mattermost_instance/tasks/main.yml b/roles/mattermost_instance/tasks/main.yml index f53b28ae6f316c64e094fe5ced0bd54051d7fb7a..2bae435a86366b26d0087610e69daffcaa298211 100644 --- a/roles/mattermost_instance/tasks/main.yml +++ b/roles/mattermost_instance/tasks/main.yml @@ -30,3 +30,6 @@ when: restore_action == 'restore' when: app_run == 'restore' + +- import_role: + name: instance_prod diff --git a/roles/mosparo/tasks/main.yml b/roles/mosparo/tasks/main.yml index d79b4767081851162df6bf08326d7e64290d7bf2..70c62b6a4856a1b8116054dbf8e67ab4c659be56 100644 --- a/roles/mosparo/tasks/main.yml +++ b/roles/mosparo/tasks/main.yml @@ -17,3 +17,6 @@ - import_role: name: _app_restore_instance when: app_run == 'restore' + +- import_role: + name: instance_prod diff --git a/roles/nextcloud_instance/tasks/main.yml b/roles/nextcloud_instance/tasks/main.yml index c8c27d2d12d01fe7a4c75a553fbad36d193a197c..51f4921139a993acc36d1217c9c0a33cde6a2a1e 100644 --- a/roles/nextcloud_instance/tasks/main.yml +++ b/roles/nextcloud_instance/tasks/main.yml @@ -17,4 +17,7 @@ - import_role: name: _app_restore_instance - when: app_run == 'restore' \ No newline at end of file + when: app_run == 'restore' + +- import_role: + name: instance_prod diff --git a/roles/rocketchat_instance/tasks/main.yml b/roles/rocketchat_instance/tasks/main.yml index 81b879b4a3605a45de7f36280c1d58d1c0bc4400..2e1f4b6e4f81424a70637363e7b66bdf10146b2f 100644 --- a/roles/rocketchat_instance/tasks/main.yml +++ b/roles/rocketchat_instance/tasks/main.yml @@ -31,3 +31,6 @@ when: restore_action == 'restore' when: app_run == 'restore' + +- import_role: + name: instance_prod diff --git a/roles/wordpress_instance/tasks/main.yml b/roles/wordpress_instance/tasks/main.yml index 24624a5461e83e8a8964de1bb689255d0088ce4c..1feab5af31d288cf0016d9e7fd80a18fd2735ada 100644 --- a/roles/wordpress_instance/tasks/main.yml +++ b/roles/wordpress_instance/tasks/main.yml @@ -1,4 +1,7 @@ --- - - import_role: - name: _web_app +- import_role: + name: _web_app + +- import_role: + name: instance_prod diff --git a/roles/yeswiki_instance/tasks/main.yml b/roles/yeswiki_instance/tasks/main.yml index adee5c24b1e87c9afdb81f5856c975a2af4a13d5..9bfef85ed80509661bd5be7553eb1a0983aa0c5d 100644 --- a/roles/yeswiki_instance/tasks/main.yml +++ b/roles/yeswiki_instance/tasks/main.yml @@ -3,5 +3,8 @@ - import_role: name: _web_app + - import_role: + name: instance_prod + # - import_tasks: # file: postinstall_yw.yml