diff --git a/roles/_php_fpm_pool/handlers/main.yml b/roles/_php_fpm_pool/handlers/main.yml new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/roles/_php_fpm_pool/tasks/main.yml b/roles/_php_fpm_pool/tasks/main.yml new file mode 100644 index 0000000000000000000000000000000000000000..274c2013598315b772e9410ba2f65218984608db --- /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 0000000000000000000000000000000000000000..cd21505a47e530a967e3c44bd2a772d1b8d08bd7 --- /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 9321d5df8a7ca34d3db5d35af261801b1e4b8524..18b7a5f128d4ce4f75bea067b4c1a0aae59e44d5 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) \ No newline at end of file diff --git a/roles/garradin_instance/tasks/install.yml b/roles/garradin_instance/tasks/install.yml new file mode 100644 index 0000000000000000000000000000000000000000..6fdeae59f6c4a1c5483008cbec40c26e222ef6c7 --- /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 ebf374295dec7a4982d7828d2db7da816f9a4774..173709ca27329d2f0251d8e1af42f9b418f8e984 100644 --- a/roles/garradin_instance/tasks/main.yml +++ b/roles/garradin_instance/tasks/main.yml @@ -1,7 +1,9 @@ --- +- import_tasks: install.yml + when: app_run in ['install', 'reinstall', 'upgrade'] -- import_role: - name: _web_app +- import_tasks: uninstall.yml + when: app_run == 'uninstall' - name: Restic Role import_role: diff --git a/roles/garradin_instance/tasks/uninstall.yml b/roles/garradin_instance/tasks/uninstall.yml new file mode 100644 index 0000000000000000000000000000000000000000..36960b821726cf5e4f908457a440631d67ff649d --- /dev/null +++ b/roles/garradin_instance/tasks/uninstall.yml @@ -0,0 +1,3 @@ +--- +- import_role: + name: _web_app \ No newline at end of file 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 94% rename from roles/php7_fpm/tasks/main.yml rename to roles/php7_8_fpm/tasks/main.yml index 2493a2af7ff040ff9d85ea94eb8cd054ea42de02..e114c0a286c006f0115ed84ffd1f4234ee9ab23d 100644 --- a/roles/php7_fpm/tasks/main.yml +++ b/roles/php7_8_fpm/tasks/main.yml @@ -51,6 +51,17 @@ 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: "PHP package for apache" apt: name: "{{ php_apache_package }}" 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 94% rename from roles/php7_fpm/vars/main.yml rename to roles/php7_8_fpm/vars/main.yml index 448d33336c69b92719e7e66d2b881c3d431c376f..2f48a03cfa55521fce8001e033dfdad11c52c11b 100644 --- a/roles/php7_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",