From 4d3eba47b947e77ffeedbb4a156dfffbe1bc893a Mon Sep 17 00:00:00 2001 From: oiseauroch Date: Thu, 9 Nov 2023 18:19:33 +0100 Subject: [PATCH 1/3] add instance_prod role --- roles/instance_prod/tasks/main.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 roles/instance_prod/tasks/main.yml diff --git a/roles/instance_prod/tasks/main.yml b/roles/instance_prod/tasks/main.yml new file mode 100644 index 00000000..b4718363 --- /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 }}' " -- GitLab From fe9bd187343c4742d244087193e58321aa943da1 Mon Sep 17 00:00:00 2001 From: oiseauroch Date: Fri, 10 Nov 2023 11:37:04 +0100 Subject: [PATCH 2/3] test for yeswiki instance --- roles/yeswiki_instance/tasks/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/roles/yeswiki_instance/tasks/main.yml b/roles/yeswiki_instance/tasks/main.yml index adee5c24..9bfef85e 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 -- GitLab From c8d0e002faf728b4a76ea48d36f8db869b6eb19f Mon Sep 17 00:00:00 2001 From: oiseauroch Date: Mon, 13 Nov 2023 14:11:03 +0100 Subject: [PATCH 3/3] add update_prod to roles --- roles/bbb_instance/tasks/main.yml | 3 +++ roles/collabora_online_instance/tasks/main.yml | 3 +++ roles/etherpad/tasks/main.yml | 5 ++++- roles/framadate_instance/tasks/main.yml | 5 ++++- roles/garradin_instance/tasks/main.yml | 2 ++ roles/gitlab/tasks/main.yml | 3 +++ roles/humhub/tasks/main.yml | 5 ++++- roles/mattermost_instance/tasks/main.yml | 3 +++ roles/mosparo/tasks/main.yml | 3 +++ roles/nextcloud_instance/tasks/main.yml | 5 ++++- roles/rocketchat_instance/tasks/main.yml | 3 +++ roles/wordpress_instance/tasks/main.yml | 7 +++++-- 12 files changed, 41 insertions(+), 6 deletions(-) diff --git a/roles/bbb_instance/tasks/main.yml b/roles/bbb_instance/tasks/main.yml index dd69b36d..8a02f87d 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 77540f0b..5a6321e5 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 27b0405f..071e73bf 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 0dfe3710..35ab3767 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 ebf37429..e1d4729d 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 2cd8fdae..2ff959da 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 e68deade..9974a69f 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/mattermost_instance/tasks/main.yml b/roles/mattermost_instance/tasks/main.yml index f53b28ae..2bae435a 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 d79b4767..70c62b6a 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 c8c27d2d..51f49211 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 81b879b4..2e1f4b6e 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 24624a54..1feab5af 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 -- GitLab