From 749ba54127bbd0506492b6b6fe4cfd163f51eb9c Mon Sep 17 00:00:00 2001 From: Julien GOMES DIAS Date: Thu, 27 Jan 2022 11:43:43 +0100 Subject: [PATCH 1/4] [fix] install/uninstall garradin --- roles/garradin_instance/tasks/install.yml | 41 ++++++++++++++++++++ roles/garradin_instance/tasks/main.yml | 43 ++------------------- roles/garradin_instance/tasks/uninstall.yml | 3 ++ 3 files changed, 48 insertions(+), 39 deletions(-) create mode 100644 roles/garradin_instance/tasks/install.yml create mode 100644 roles/garradin_instance/tasks/uninstall.yml diff --git a/roles/garradin_instance/tasks/install.yml b/roles/garradin_instance/tasks/install.yml new file mode 100644 index 00000000..6fdeae59 --- /dev/null +++ b/roles/garradin_instance/tasks/install.yml @@ -0,0 +1,41 @@ +--- + +- import_role: + name: _web_app + +- name: "template {{ rev_proxy }}_app.j2 {{ app_instance_id }}" + template: + src: "{{ rev_proxy }}_app.j2" + dest: "/etc/{{ rev_proxy }}/sites-available/{{ app_instance_id }}.conf" + when: app_wsgi == "no" + notify: reload {{ rev_proxy }} web_app + tags: + - garradin_rev_proxy + +- name: Check if app folder exists + stat: + path: "{{ app_instance_root }}" + register: app_folder + +- name: Check if data folder exists + stat: + path: "{{ app_data }}" + register: data_folder + tags: "data_setup" + +- name: "dir {{ app_data }}" + file: + path: "{{ app_data }}" + state: directory + mode: 0700 + group: "www-data" + owner: "{{ app_user }}" + when: data_folder.stat.exists == false and app_folder.stat.exists + tags: "data_setup" + +- name: Configuring garradin if app folder exists + import_tasks: configure.yml + when: app_folder.stat.exists + tags: + - garradin_configure + diff --git a/roles/garradin_instance/tasks/main.yml b/roles/garradin_instance/tasks/main.yml index 6fdeae59..80e8fc6c 100644 --- a/roles/garradin_instance/tasks/main.yml +++ b/roles/garradin_instance/tasks/main.yml @@ -1,41 +1,6 @@ --- +- import_tasks: install.yml + when: app_run in ['install', 'reinstall', 'upgrade'] -- import_role: - name: _web_app - -- name: "template {{ rev_proxy }}_app.j2 {{ app_instance_id }}" - template: - src: "{{ rev_proxy }}_app.j2" - dest: "/etc/{{ rev_proxy }}/sites-available/{{ app_instance_id }}.conf" - when: app_wsgi == "no" - notify: reload {{ rev_proxy }} web_app - tags: - - garradin_rev_proxy - -- name: Check if app folder exists - stat: - path: "{{ app_instance_root }}" - register: app_folder - -- name: Check if data folder exists - stat: - path: "{{ app_data }}" - register: data_folder - tags: "data_setup" - -- name: "dir {{ app_data }}" - file: - path: "{{ app_data }}" - state: directory - mode: 0700 - group: "www-data" - owner: "{{ app_user }}" - when: data_folder.stat.exists == false and app_folder.stat.exists - tags: "data_setup" - -- name: Configuring garradin if app folder exists - import_tasks: configure.yml - when: app_folder.stat.exists - tags: - - garradin_configure - +- import_tasks: uninstall.yml + when: app_run == 'uninstall' diff --git a/roles/garradin_instance/tasks/uninstall.yml b/roles/garradin_instance/tasks/uninstall.yml new file mode 100644 index 00000000..36960b82 --- /dev/null +++ b/roles/garradin_instance/tasks/uninstall.yml @@ -0,0 +1,3 @@ +--- +- import_role: + name: _web_app \ No newline at end of file -- GitLab From 068382938b7b37d58e5746d653f9d8705b946cb6 Mon Sep 17 00:00:00 2001 From: Julien Gomes Dias Date: Mon, 11 Apr 2022 16:59:19 +0200 Subject: [PATCH 2/4] =?UTF-8?q?[wip]=20Passer=20=C3=A0=20php7=5F8=20pour?= =?UTF-8?q?=20php8=20et=20l'int=C3=A9gration=20de=20json=20dans=20le=20cor?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- roles/_php_fpm_pool/handlers/main.yml | 0 roles/_php_fpm_pool/tasks/main.yml | 8 ++++++++ roles/_php_fpm_pool/templates/php_config.yml | 2 ++ roles/base_platform/tasks/main.yml | 2 +- roles/{php7_fpm => php7_8_fpm}/defaults/main.yml | 0 roles/{php7_fpm => php7_8_fpm}/handlers/main.yml | 0 roles/{php7_fpm => php7_8_fpm}/readme.md | 0 roles/{php7_fpm => php7_8_fpm}/tasks/composer.yml | 0 roles/{php7_fpm => php7_8_fpm}/tasks/configure_fpm.yml | 0 roles/{php7_fpm => php7_8_fpm}/tasks/main.yml | 6 ++++++ .../{php7_fpm => php7_8_fpm}/templates/php7-fpm.monit.j2 | 0 roles/{php7_fpm => php7_8_fpm}/templates/redis.monit.j2 | 0 roles/{php7_fpm => php7_8_fpm}/vars/main.yml | 0 13 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 roles/_php_fpm_pool/handlers/main.yml create mode 100644 roles/_php_fpm_pool/tasks/main.yml create mode 100644 roles/_php_fpm_pool/templates/php_config.yml rename roles/{php7_fpm => php7_8_fpm}/defaults/main.yml (100%) rename roles/{php7_fpm => php7_8_fpm}/handlers/main.yml (100%) rename roles/{php7_fpm => php7_8_fpm}/readme.md (100%) rename roles/{php7_fpm => php7_8_fpm}/tasks/composer.yml (100%) rename roles/{php7_fpm => php7_8_fpm}/tasks/configure_fpm.yml (100%) rename roles/{php7_fpm => php7_8_fpm}/tasks/main.yml (97%) rename roles/{php7_fpm => php7_8_fpm}/templates/php7-fpm.monit.j2 (100%) rename roles/{php7_fpm => php7_8_fpm}/templates/redis.monit.j2 (100%) rename roles/{php7_fpm => php7_8_fpm}/vars/main.yml (100%) diff --git a/roles/_php_fpm_pool/handlers/main.yml b/roles/_php_fpm_pool/handlers/main.yml new file mode 100644 index 00000000..e69de29b diff --git a/roles/_php_fpm_pool/tasks/main.yml b/roles/_php_fpm_pool/tasks/main.yml new file mode 100644 index 00000000..274c2013 --- /dev/null +++ b/roles/_php_fpm_pool/tasks/main.yml @@ -0,0 +1,8 @@ +--- +- name: "template user-php-fpm.j2 for {{ app_user }} {{ php_version }}" + template: + src: "php-fpm-user.j2" + dest: "/etc/php/{{ php_version }}/fpm/pool.d/php-fpm-{{ app_user }}.conf" + notify: reload php-fpm web_app + tags: + - php_config_pool \ No newline at end of file diff --git a/roles/_php_fpm_pool/templates/php_config.yml b/roles/_php_fpm_pool/templates/php_config.yml new file mode 100644 index 00000000..cd21505a --- /dev/null +++ b/roles/_php_fpm_pool/templates/php_config.yml @@ -0,0 +1,2 @@ +--- + diff --git a/roles/base_platform/tasks/main.yml b/roles/base_platform/tasks/main.yml index e0b9b830..94879932 100644 --- a/roles/base_platform/tasks/main.yml +++ b/roles/base_platform/tasks/main.yml @@ -34,5 +34,5 @@ - name: "role php7_fpm" import_role: - name: "php7_fpm" + name: "php7_8_fpm" when: (php_server is defined) and (rev_proxy is defined) and (php_version is defined) and (php_server) diff --git a/roles/php7_fpm/defaults/main.yml b/roles/php7_8_fpm/defaults/main.yml similarity index 100% rename from roles/php7_fpm/defaults/main.yml rename to roles/php7_8_fpm/defaults/main.yml diff --git a/roles/php7_fpm/handlers/main.yml b/roles/php7_8_fpm/handlers/main.yml similarity index 100% rename from roles/php7_fpm/handlers/main.yml rename to roles/php7_8_fpm/handlers/main.yml diff --git a/roles/php7_fpm/readme.md b/roles/php7_8_fpm/readme.md similarity index 100% rename from roles/php7_fpm/readme.md rename to roles/php7_8_fpm/readme.md diff --git a/roles/php7_fpm/tasks/composer.yml b/roles/php7_8_fpm/tasks/composer.yml similarity index 100% rename from roles/php7_fpm/tasks/composer.yml rename to roles/php7_8_fpm/tasks/composer.yml diff --git a/roles/php7_fpm/tasks/configure_fpm.yml b/roles/php7_8_fpm/tasks/configure_fpm.yml similarity index 100% rename from roles/php7_fpm/tasks/configure_fpm.yml rename to roles/php7_8_fpm/tasks/configure_fpm.yml diff --git a/roles/php7_fpm/tasks/main.yml b/roles/php7_8_fpm/tasks/main.yml similarity index 97% rename from roles/php7_fpm/tasks/main.yml rename to roles/php7_8_fpm/tasks/main.yml index 86aeb24f..53ca536c 100644 --- a/roles/php7_fpm/tasks/main.yml +++ b/roles/php7_8_fpm/tasks/main.yml @@ -50,6 +50,12 @@ loop_var: php_package tags: - php + + - name: "Package Specific for < 8.0" + apt: + name: "php{{ php_version }}-json" + state: present + when: "php_version < 8.0" - name: "PHP package for apache" apt: diff --git a/roles/php7_fpm/templates/php7-fpm.monit.j2 b/roles/php7_8_fpm/templates/php7-fpm.monit.j2 similarity index 100% rename from roles/php7_fpm/templates/php7-fpm.monit.j2 rename to roles/php7_8_fpm/templates/php7-fpm.monit.j2 diff --git a/roles/php7_fpm/templates/redis.monit.j2 b/roles/php7_8_fpm/templates/redis.monit.j2 similarity index 100% rename from roles/php7_fpm/templates/redis.monit.j2 rename to roles/php7_8_fpm/templates/redis.monit.j2 diff --git a/roles/php7_fpm/vars/main.yml b/roles/php7_8_fpm/vars/main.yml similarity index 100% rename from roles/php7_fpm/vars/main.yml rename to roles/php7_8_fpm/vars/main.yml -- GitLab From d3c2a36632c413cf4a282a376b5aa06d7ad6bc0a Mon Sep 17 00:00:00 2001 From: Julien Gomes Dias Date: Tue, 5 Jul 2022 11:41:21 +0200 Subject: [PATCH 3/4] [add] Package 75 correction --- roles/php7_8_fpm/tasks/main.yml | 11 +++++++++++ roles/php7_8_fpm/vars/main.yml | 4 ++++ 2 files changed, 15 insertions(+) diff --git a/roles/php7_8_fpm/tasks/main.yml b/roles/php7_8_fpm/tasks/main.yml index 53ca536c..f9b9ff0d 100644 --- a/roles/php7_8_fpm/tasks/main.yml +++ b/roles/php7_8_fpm/tasks/main.yml @@ -50,6 +50,17 @@ loop_var: php_package tags: - php + + - name: "PHP packages for php 7 or 5" + apt: + name: "{{ php_package }}" + state: present + loop: "{{ php_packages_php75 }}" + loop_control: + loop_var: php_package + tags: + - php + when: php_version | regex_search('^7.*$|^5.*$') - name: "Package Specific for < 8.0" apt: diff --git a/roles/php7_8_fpm/vars/main.yml b/roles/php7_8_fpm/vars/main.yml index 448d3333..2f48a03c 100644 --- a/roles/php7_8_fpm/vars/main.yml +++ b/roles/php7_8_fpm/vars/main.yml @@ -7,6 +7,10 @@ php_www_conf_file: "/etc/php/{{ php_version }}/fpm/pool.d/www.conf" + php_packages_php75: [ + "php{{ php_version }}-json" + ] + php_packages: [ "libmagickcore-6.q16-3-extra", "imagemagick", -- GitLab From eb6f5adcc6f3aa2e27fb54a40e6cad07bcc8354b Mon Sep 17 00:00:00 2001 From: Admin paquerette Date: Tue, 27 Sep 2022 15:21:55 +0200 Subject: [PATCH 4/4] [fix] remove dep json --- roles/php7_8_fpm/tasks/main.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/roles/php7_8_fpm/tasks/main.yml b/roles/php7_8_fpm/tasks/main.yml index a53163aa..e114c0a2 100644 --- a/roles/php7_8_fpm/tasks/main.yml +++ b/roles/php7_8_fpm/tasks/main.yml @@ -61,12 +61,6 @@ tags: - php when: php_version | regex_search('^7.*$|^5.*$') - - - name: "Package Specific for < 8.0" - apt: - name: "php{{ php_version }}-json" - state: present - when: "php_version < 8.0" - name: "PHP package for apache" apt: -- GitLab