From 30d9e826b8e666aef2e743b4d0db65194949bbc8 Mon Sep 17 00:00:00 2001 From: Gregory Colpart Date: Fri, 18 Aug 2017 12:21:20 +0200 Subject: [PATCH 1/4] rename php-fpm -> php --- {php-fpm => php}/.kitchen.yml | 0 {php-fpm => php}/README.md | 0 {php-fpm => php}/defaults/main.yml | 0 {php-fpm => php}/handlers/main.yml | 0 {php-fpm => php}/meta/main.yml | 0 {php-fpm => php}/tasks/main.yml | 0 {php-fpm => php}/tests/test.yml | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename {php-fpm => php}/.kitchen.yml (100%) rename {php-fpm => php}/README.md (100%) rename {php-fpm => php}/defaults/main.yml (100%) rename {php-fpm => php}/handlers/main.yml (100%) rename {php-fpm => php}/meta/main.yml (100%) rename {php-fpm => php}/tasks/main.yml (100%) rename {php-fpm => php}/tests/test.yml (100%) diff --git a/php-fpm/.kitchen.yml b/php/.kitchen.yml similarity index 100% rename from php-fpm/.kitchen.yml rename to php/.kitchen.yml diff --git a/php-fpm/README.md b/php/README.md similarity index 100% rename from php-fpm/README.md rename to php/README.md diff --git a/php-fpm/defaults/main.yml b/php/defaults/main.yml similarity index 100% rename from php-fpm/defaults/main.yml rename to php/defaults/main.yml diff --git a/php-fpm/handlers/main.yml b/php/handlers/main.yml similarity index 100% rename from php-fpm/handlers/main.yml rename to php/handlers/main.yml diff --git a/php-fpm/meta/main.yml b/php/meta/main.yml similarity index 100% rename from php-fpm/meta/main.yml rename to php/meta/main.yml diff --git a/php-fpm/tasks/main.yml b/php/tasks/main.yml similarity index 100% rename from php-fpm/tasks/main.yml rename to php/tasks/main.yml diff --git a/php-fpm/tests/test.yml b/php/tests/test.yml similarity index 100% rename from php-fpm/tests/test.yml rename to php/tests/test.yml From 2e1deb3e93c6638c420377ff8075891b07bfcfe9 Mon Sep 17 00:00:00 2001 From: Gregory Colpart Date: Tue, 22 Aug 2017 05:57:19 +0200 Subject: [PATCH 2/4] write php role with https://wiki.evolix.org/HowtoPHP --- php/README.md | 4 +- php/defaults/main.yml | 3 ++ php/tasks/apache.yml | 59 +++++++++++++++++++++++++ php/tasks/fpm.yml | 90 +++++++++++++++++++++++++++++++++++++++ php/tasks/main.yml | 33 +++++++------- php/tasks/php_jessie.yml | 53 +++++++++++++++++++++++ php/tasks/php_stretch.yml | 54 +++++++++++++++++++++++ 7 files changed, 278 insertions(+), 18 deletions(-) create mode 100644 php/tasks/apache.yml create mode 100644 php/tasks/fpm.yml create mode 100644 php/tasks/php_jessie.yml create mode 100644 php/tasks/php_stretch.yml diff --git a/php/README.md b/php/README.md index bac322fe..e0a194ac 100644 --- a/php/README.md +++ b/php/README.md @@ -1,6 +1,6 @@ -# PHP-FPM +# PHP -Installation and basic configuration of php-fpm +Installation and basic configuration of PHP ## Tasks diff --git a/php/defaults/main.yml b/php/defaults/main.yml index ed97d539..010b8d62 100644 --- a/php/defaults/main.yml +++ b/php/defaults/main.yml @@ -1 +1,4 @@ --- + +php_fpm_enable: False +php_apache_enable: False diff --git a/php/tasks/apache.yml b/php/tasks/apache.yml new file mode 100644 index 00000000..2059648b --- /dev/null +++ b/php/tasks/apache.yml @@ -0,0 +1,59 @@ +--- + +- name: "Install mod_php packages (jessie)" + apt: + name: '{{ item }}' + state: present + with_items: + - libapache2-mod-php5 + when: ansible_distribution_release == "jessie" + +- name: "Install mod_php packages (Debian 9 or later)" + apt: + name: '{{ item }}' + state: present + with_items: + - libapache2-mod-php + when: ansible_distribution_major_version | version_compare('9', '>=') + +- name: "Set php.ini config for apache2 (jessie)" + set_fact: + php_apache_defaults_file: /etc/php5/apache2/conf.d/z-evolinux-defaults.ini + php_apache_custom_file: /etc/php5/apache2/conf.d/zzz-evolinux-custom.ini + when: ansible_distribution_release == "jessie" + +- name: "Set php.ini config for apache2 (Debian 9 or later)" + set_fact: + php_apache_defaults_file: /etc/php/7.0/apache2/conf.d/z-evolinux-defaults.ini + php_apache_custom_file: /etc/php/7.0/apache2/conf.d/zzz-evolinux-custom.ini + when: ansible_distribution_major_version | version_compare('9', '>=') + +- name: Set default values for PHP + ini_file: + dest: "{{ php_apache_defaults_file }}" + section: PHP + option: "{{ item.option }}" + value: "{{ item.value }}" + mode: "0644" + create: yes + with_items: + - { option: "short_open_tag", value: "Off" } + - { option: "expose_php", value: "Off" } + - { option: "display_errors", value: "Off" } + - { option: "log_errors", value: "On" } + - { option: "html_errors", value: "Off" } + - { option: "allow_url_fopen", value: "Off" } + +- name: Disable PHP functions + ini_file: + dest: "{{ php_apache_defaults_file }}" + section: PHP + option: disable_functions + value: "exec,shell-exec,system,passthru,putenv,popen" + +- name: Custom php.ini + copy: + dest: "{{ php_apache_custom_file }}" + content: | + # Put customized values here. + force: no diff --git a/php/tasks/fpm.yml b/php/tasks/fpm.yml new file mode 100644 index 00000000..276a7181 --- /dev/null +++ b/php/tasks/fpm.yml @@ -0,0 +1,90 @@ +--- + +- name: "Install PHP FPM packages (jessie)" + apt: + name: '{{ item }}' + state: present + with_items: + - php5-fpm + when: ansible_distribution_release == "jessie" + +- name: "Install PHP FPM packages (Debian 9 or later)" + apt: + name: '{{ item }}' + state: present + with_items: + - php-fpm + when: ansible_distribution_major_version | version_compare('9', '>=') + +- name: "Set config files for FPM (jessie)" + set_fact: + phpini_fpm_defaults_file: /etc/php5/fpm/conf.d/z-evolinux-defaults.ini + phpini_fpm_custom_file: /etc/php5/fpm/conf.d/zzz-evolinux-custom.ini + php_fpm_defaults_file: /etc/php5/fpm/pool.d/z-evolinux-defaults.conf + php_fpm_custom_file: /etc/php5/fpm/pool.d/zzz-evolinux-custom.conf + when: ansible_distribution_release == "jessie" + +- name: "Set config files for FPM (Debian 9 or later)" + set_fact: + phpini_fpm_defaults_file: /etc/php/7.0/fpm/conf.d/z-evolinux-defaults.ini + phpini_fpm_custom_file: /etc/php/7.0/fpm/conf.d/zzz-evolinux-custom.ini + php_fpm_defaults_file: /etc/php/7.0/fpm/pool.d/z-evolinux-defaults.conf + php_fpm_custom_file: /etc/php/7.0/fpm/pool.d/zzz-evolinux-custom.conf + when: ansible_distribution_major_version | version_compare('9', '>=') + +- name: Set default php.ini values for FPM + ini_file: + dest: "{{ phpini_fpm_defaults_file }}" + section: PHP + option: "{{ item.option }}" + value: "{{ item.value }}" + mode: "0644" + create: yes + with_items: + - { option: "short_open_tag", value: "Off" } + - { option: "expose_php", value: "Off" } + - { option: "display_errors", value: "Off" } + - { option: "log_errors", value: "On" } + - { option: "html_errors", value: "Off" } + - { option: "allow_url_fopen", value: "Off" } + +- name: Disable PHP functions for FPM + ini_file: + dest: "{{ phpini_fpm_defaults_file }}" + section: PHP + option: disable_functions + value: "exec,shell-exec,system,passthru,putenv,popen" + +- name: Custom php.ini for FPM + copy: + dest: "{{ phpini_fpm_custom_file }}" + content: | + # Put customized values here. + force: no + +- name: Set default PHP FPM values + ini_file: + dest: "{{ php_fpm_defaults_file }}" + section: www + option: "{{ item.option }}" + value: "{{ item.value }}" + mode: "0644" + create: yes + with_items: + - { option: "pm", value: "ondemand" } + - { option: "pm.max_children", value: "100" } + - { option: "pm.process_idle_timeout", value: "10s" } + - { option: "slowlog", value: "log/$pool.log.slow" } + - { option: "request_slowlog_timeout", value: "5s" } + - { option: "pm.status_path", value: "/fpm_status" } + - { option: "request_terminate_timeout", value: "60s" } + - { option: "chroot", value: "/var/www/html" } + when: ansible_distribution_major_version | version_compare('9', '>=') + +- name: Custom PHP FPM values + copy: + dest: "{{ php_fpm_custom_file }}" + content: | + # Put customized values here. + force: no + diff --git a/php/tasks/main.yml b/php/tasks/main.yml index de12d1a7..7f438569 100644 --- a/php/tasks/main.yml +++ b/php/tasks/main.yml @@ -1,19 +1,20 @@ -- name: Ensure php5-fpm package is installed - apt: - name: php5-fpm - state: present - when: - - ansible_distribution == "Debian" - - ansible_distribution_release == "jessie" - tags: - - php-fpm +--- -- name: Ensure php-fpm packages is installed - apt: - name: php-fpm - state: present +- fail: + msg: only compatible with Debian >= 8 when: - ansible_distribution == "Debian" - - ansible_distribution_major_version | version_compare('9', '>=') - tags: - - php-fpm + - ansible_distribution_major_version | version_compare('8', '<') + +- include: php_jessie.yml + when: ansible_distribution_release == "jessie" + +- include: php_stretch.yml + when: ansible_distribution_major_version | version_compare('9', '>=') + +- include: fpm.yml + when: php_fpm_enable + +- include: apache.yml + when: php_apache_enable + diff --git a/php/tasks/php_jessie.yml b/php/tasks/php_jessie.yml new file mode 100644 index 00000000..53b4e4ca --- /dev/null +++ b/php/tasks/php_jessie.yml @@ -0,0 +1,53 @@ +--- + +- name: "Install PHP packages (jessie)" + apt: + name: '{{ item }}' + state: present + with_items: + - php5 + - php5-cli + - php5-gd + - php5-imap + - php5-ldap + - php5-mcrypt + - php5-mysql + - php5-pgsql + - php-gettext + - php5-curl + - libssh2-php + +- name: "Set php.ini config for CLI (jessie)" + set_fact: + phpini_cli_defaults_file: /etc/php5/cli/conf.d/z-evolinux-defaults.ini + phpini_cli_custom_file: /etc/php5/cli/conf.d/zzz-evolinux-custom.ini + +- name: Set default php.ini values for CLI + ini_file: + dest: "{{ phpini_cli_defaults_file }}" + section: PHP + option: "{{ item.option }}" + value: "{{ item.value }}" + mode: "0644" + create: yes + with_items: + - { option: "short_open_tag", value: "Off" } + - { option: "expose_php", value: "Off" } + - { option: "display_errors", value: "Off" } + - { option: "log_errors", value: "On" } + - { option: "html_errors", value: "Off" } + - { option: "allow_url_fopen", value: "Off" } + +- name: Disable PHP functions for CLI + ini_file: + dest: "{{ phpini_cli_defaults_file }}" + section: PHP + option: disable_functions + value: "exec,shell-exec,system,passthru,putenv,popen" + +- name: Custom php.ini for CLI + copy: + dest: "{{ phpini_cli_custom_file }}" + content: | + # Put customized values here. + force: no diff --git a/php/tasks/php_stretch.yml b/php/tasks/php_stretch.yml new file mode 100644 index 00000000..64b54a45 --- /dev/null +++ b/php/tasks/php_stretch.yml @@ -0,0 +1,54 @@ +--- + +- name: "Install PHP packages (Debian 9 or later)" + apt: + name: '{{ item }}' + state: present + with_items: + - php + - php-cli + - php-gd + - php-imap + - php-ldap + - php-mcrypt + - php-mysql + - php-pgsql + - php-gettext + - php-curl + - php-ssh2 + - composer + +- name: "Set php.ini config for CLI (Debian 9 or later)" + set_fact: + phpini_cli_defaults_file: /etc/php/7.0/cli/conf.d/z-evolinux-defaults.ini + phpini_cli_custom_file: /etc/php/7.0/cli/conf.d/zzz-evolinux-custom.ini + +- name: Set default php.ini values for CLI + ini_file: + dest: "{{ phpini_cli_defaults_file }}" + section: PHP + option: "{{ item.option }}" + value: "{{ item.value }}" + mode: "0644" + create: yes + with_items: + - { option: "short_open_tag", value: "Off" } + - { option: "expose_php", value: "Off" } + - { option: "display_errors", value: "Off" } + - { option: "log_errors", value: "On" } + - { option: "html_errors", value: "Off" } + - { option: "allow_url_fopen", value: "Off" } + +- name: Disable PHP functions for CLI + ini_file: + dest: "{{ phpini_cli_defaults_file }}" + section: PHP + option: disable_functions + value: "exec,shell-exec,system,passthru,putenv,popen" + +- name: Custom php.ini for CLI + copy: + dest: "{{ phpini_cli_custom_file }}" + content: | + # Put customized values here. + force: no From 43e0f7589f29944bc1be2a217e018e1daa80fd92 Mon Sep 17 00:00:00 2001 From: Gregory Colpart Date: Tue, 22 Aug 2017 06:09:58 +0200 Subject: [PATCH 3/4] use now PHP role --- packweb-apache/tasks/main.yml | 15 ++++---- packweb-apache/tasks/php.yml | 65 ----------------------------------- packweb-apache/tasks/php5.yml | 64 ---------------------------------- 3 files changed, 8 insertions(+), 136 deletions(-) delete mode 100644 packweb-apache/tasks/php.yml delete mode 100644 packweb-apache/tasks/php5.yml diff --git a/packweb-apache/tasks/main.yml b/packweb-apache/tasks/main.yml index 1aefaa7b..4abe074a 100644 --- a/packweb-apache/tasks/main.yml +++ b/packweb-apache/tasks/main.yml @@ -2,7 +2,13 @@ - name: Include apache role include_role: - name: "apache" + name: apache + +- name: Include PHP role + include_role: + name: php + vars: + php_apache_enable: True - name: Add elements to user account template file: @@ -38,12 +44,6 @@ - include: apache.yml -- include: php5.yml - when: ansible_distribution_release == "jessie" - -- include: php.yml - when: ansible_distribution_major_version | version_compare('9', '>=') - - include: phpmyadmin.yml - include: awstats.yml @@ -123,3 +123,4 @@ name: evoadmin vars: evoadmin_enable_vhost: "{{ packweb_enable_evoadmin_vhost }}" + diff --git a/packweb-apache/tasks/php.yml b/packweb-apache/tasks/php.yml deleted file mode 100644 index d97b5fc4..00000000 --- a/packweb-apache/tasks/php.yml +++ /dev/null @@ -1,65 +0,0 @@ ---- - -- name: Install PHP packages - apt: - name: '{{ item }}' - state: present - with_items: - - libapache2-mod-php7.0 - - php7.0 - - php7.0-gd - - php7.0-imap - - php7.0-ldap - - php7.0-mcrypt - - php7.0-mysql - - php7.0-pgsql - - php7.0-curl - - php-gettext - - php-ssh2 - tags: - - apache - -- name: Set variables for php config files - set_fact: - php7_apache_defaults_file: /etc/php/7.0/apache2/conf.d/z-evolinux_defaults.ini - php7_apache_custom_file: /etc/php/7.0/apache2/conf.d/zzz-evolinux_custom.ini - -- name: Set default values for PHP - ini_file: - dest: "{{ php7_apache_defaults_file }}" - section: PHP - option: "{{ item.option }}" - value: "{{ item.value }}" - mode: "0644" - create: yes - with_items: - - { option: "short_open_tag", value: "Off" } - - { option: "expose_php", value: "Off" } - - { option: "display_errors", value: "Off" } - - { option: "html_errors", value: "Off" } - - { option: "log_errors", value: "On" } - - { option: "allow_url_fopen", value: "Off" } - notify: reload apache - -- name: Disable PHP exec function without evoadmin - ini_file: - dest: "{{ php7_apache_defaults_file }}" - section: PHP - option: disable_functions - value: "exec,shell-exec,system,passthru,putenv,popen" - when: not packweb_enable_evoadmin_vhost - -- name: Don't disable PHP exec function with evoadmin - ini_file: - dest: "{{ php7_apache_defaults_file }}" - section: PHP - option: disable_functions - value: "shell-exec,system,passthru,putenv,popen" - when: packweb_enable_evoadmin_vhost - -- name: Custom php.ini - copy: - dest: "{{ php7_apache_custom_file }}" - content: | - # Put customized values here. - force: no diff --git a/packweb-apache/tasks/php5.yml b/packweb-apache/tasks/php5.yml deleted file mode 100644 index ee65fd2f..00000000 --- a/packweb-apache/tasks/php5.yml +++ /dev/null @@ -1,64 +0,0 @@ ---- - -- name: Install PHP5 packages - apt: - name: '{{ item }}' - state: present - with_items: - - libapache2-mod-php5 - - php5 - - php5-gd - - php5-imap - - php5-ldap - - php5-mcrypt - - php5-mysql - - php5-pgsql - - php-gettext - - php5-curl - - libssh2-php - tags: - - apache - -- name: Set variables for php config files - set_fact: - php5_apache5_defaults_file: /etc/php5/apache2/conf.d/z-evolinux_defaults.ini - php5_apache5_custom_file: /etc/php5/apache2/conf.d/zzz-evolinux_custom.ini - -- name: Set default values for PHP - ini_file: - dest: "{{ php5_apache5_defaults_file }}" - section: PHP - option: "{{ item.option }}" - value: "{{ item.value }}" - mode: "0644" - create: yes - with_items: - - { option: "short_open_tag", value: "Off" } - - { option: "expose_php", value: "Off" } - - { option: "display_errors", value: "Off" } - - { option: "log_errors", value: "On" } - - { option: "allow_url_fopen", value: "Off" } - notify: reload apache - -- name: Disable PHP exec function without evoadmin - ini_file: - dest: "{{ php5_apache5_defaults_file }}" - section: PHP - option: disable_functions - value: "exec,shell-exec,system,passthru,putenv,popen" - when: not packweb_enable_evoadmin_vhost - -- name: Don't disable PHP exec function with evoadmin - ini_file: - dest: "{{ php5_apache5_defaults_file }}" - section: PHP - option: disable_functions - value: "shell-exec,system,passthru,putenv,popen" - when: packweb_enable_evoadmin_vhost - -- name: Custom php.ini - copy: - dest: "{{ php5_apache5_custom_file }}" - content: | - # Put customized values here. - force: no From 84d39d71214f8143cf3189a6ccb0d5078ce67a15 Mon Sep 17 00:00:00 2001 From: Gregory Colpart Date: Tue, 22 Aug 2017 06:20:18 +0200 Subject: [PATCH 4/4] mv evoadmin to webapps/evoadmin-web --- packweb-apache/tasks/main.yml | 2 +- {evoadmin => webapps/evoadmin-web}/defaults/main.yml | 0 {evoadmin => webapps/evoadmin-web}/files/evolinux.conf.diff | 0 {evoadmin => webapps/evoadmin-web}/handlers/main.yml | 0 {evoadmin => webapps/evoadmin-web}/tasks/config.yml | 0 {evoadmin => webapps/evoadmin-web}/tasks/ftp.yml | 0 {evoadmin => webapps/evoadmin-web}/tasks/main.yml | 0 {evoadmin => webapps/evoadmin-web}/tasks/packages.yml | 0 {evoadmin => webapps/evoadmin-web}/tasks/remount_usr_rw.yml | 0 {evoadmin => webapps/evoadmin-web}/tasks/ssl.yml | 0 {evoadmin => webapps/evoadmin-web}/tasks/user.yml | 0 {evoadmin => webapps/evoadmin-web}/tasks/web.yml | 0 .../evoadmin-web}/templates/config.local.php.j2 | 0 {evoadmin => webapps/evoadmin-web}/templates/evoadmin.conf.j2 | 0 {evoadmin => webapps/evoadmin-web}/templates/sudoers.j2 | 0 {evoadmin => webapps/evoadmin-web}/templates/web-add.conf.j2 | 0 {evoadmin => webapps/evoadmin-web}/templates/web-mail.tpl.j2 | 0 17 files changed, 1 insertion(+), 1 deletion(-) rename {evoadmin => webapps/evoadmin-web}/defaults/main.yml (100%) rename {evoadmin => webapps/evoadmin-web}/files/evolinux.conf.diff (100%) rename {evoadmin => webapps/evoadmin-web}/handlers/main.yml (100%) rename {evoadmin => webapps/evoadmin-web}/tasks/config.yml (100%) rename {evoadmin => webapps/evoadmin-web}/tasks/ftp.yml (100%) rename {evoadmin => webapps/evoadmin-web}/tasks/main.yml (100%) rename {evoadmin => webapps/evoadmin-web}/tasks/packages.yml (100%) rename {evoadmin => webapps/evoadmin-web}/tasks/remount_usr_rw.yml (100%) rename {evoadmin => webapps/evoadmin-web}/tasks/ssl.yml (100%) rename {evoadmin => webapps/evoadmin-web}/tasks/user.yml (100%) rename {evoadmin => webapps/evoadmin-web}/tasks/web.yml (100%) rename {evoadmin => webapps/evoadmin-web}/templates/config.local.php.j2 (100%) rename {evoadmin => webapps/evoadmin-web}/templates/evoadmin.conf.j2 (100%) rename {evoadmin => webapps/evoadmin-web}/templates/sudoers.j2 (100%) rename {evoadmin => webapps/evoadmin-web}/templates/web-add.conf.j2 (100%) rename {evoadmin => webapps/evoadmin-web}/templates/web-mail.tpl.j2 (100%) diff --git a/packweb-apache/tasks/main.yml b/packweb-apache/tasks/main.yml index 4abe074a..5bcd59d9 100644 --- a/packweb-apache/tasks/main.yml +++ b/packweb-apache/tasks/main.yml @@ -120,7 +120,7 @@ - name: Install Evoadmin include_role: - name: evoadmin + name: webapps/evoadmin-web vars: evoadmin_enable_vhost: "{{ packweb_enable_evoadmin_vhost }}" diff --git a/evoadmin/defaults/main.yml b/webapps/evoadmin-web/defaults/main.yml similarity index 100% rename from evoadmin/defaults/main.yml rename to webapps/evoadmin-web/defaults/main.yml diff --git a/evoadmin/files/evolinux.conf.diff b/webapps/evoadmin-web/files/evolinux.conf.diff similarity index 100% rename from evoadmin/files/evolinux.conf.diff rename to webapps/evoadmin-web/files/evolinux.conf.diff diff --git a/evoadmin/handlers/main.yml b/webapps/evoadmin-web/handlers/main.yml similarity index 100% rename from evoadmin/handlers/main.yml rename to webapps/evoadmin-web/handlers/main.yml diff --git a/evoadmin/tasks/config.yml b/webapps/evoadmin-web/tasks/config.yml similarity index 100% rename from evoadmin/tasks/config.yml rename to webapps/evoadmin-web/tasks/config.yml diff --git a/evoadmin/tasks/ftp.yml b/webapps/evoadmin-web/tasks/ftp.yml similarity index 100% rename from evoadmin/tasks/ftp.yml rename to webapps/evoadmin-web/tasks/ftp.yml diff --git a/evoadmin/tasks/main.yml b/webapps/evoadmin-web/tasks/main.yml similarity index 100% rename from evoadmin/tasks/main.yml rename to webapps/evoadmin-web/tasks/main.yml diff --git a/evoadmin/tasks/packages.yml b/webapps/evoadmin-web/tasks/packages.yml similarity index 100% rename from evoadmin/tasks/packages.yml rename to webapps/evoadmin-web/tasks/packages.yml diff --git a/evoadmin/tasks/remount_usr_rw.yml b/webapps/evoadmin-web/tasks/remount_usr_rw.yml similarity index 100% rename from evoadmin/tasks/remount_usr_rw.yml rename to webapps/evoadmin-web/tasks/remount_usr_rw.yml diff --git a/evoadmin/tasks/ssl.yml b/webapps/evoadmin-web/tasks/ssl.yml similarity index 100% rename from evoadmin/tasks/ssl.yml rename to webapps/evoadmin-web/tasks/ssl.yml diff --git a/evoadmin/tasks/user.yml b/webapps/evoadmin-web/tasks/user.yml similarity index 100% rename from evoadmin/tasks/user.yml rename to webapps/evoadmin-web/tasks/user.yml diff --git a/evoadmin/tasks/web.yml b/webapps/evoadmin-web/tasks/web.yml similarity index 100% rename from evoadmin/tasks/web.yml rename to webapps/evoadmin-web/tasks/web.yml diff --git a/evoadmin/templates/config.local.php.j2 b/webapps/evoadmin-web/templates/config.local.php.j2 similarity index 100% rename from evoadmin/templates/config.local.php.j2 rename to webapps/evoadmin-web/templates/config.local.php.j2 diff --git a/evoadmin/templates/evoadmin.conf.j2 b/webapps/evoadmin-web/templates/evoadmin.conf.j2 similarity index 100% rename from evoadmin/templates/evoadmin.conf.j2 rename to webapps/evoadmin-web/templates/evoadmin.conf.j2 diff --git a/evoadmin/templates/sudoers.j2 b/webapps/evoadmin-web/templates/sudoers.j2 similarity index 100% rename from evoadmin/templates/sudoers.j2 rename to webapps/evoadmin-web/templates/sudoers.j2 diff --git a/evoadmin/templates/web-add.conf.j2 b/webapps/evoadmin-web/templates/web-add.conf.j2 similarity index 100% rename from evoadmin/templates/web-add.conf.j2 rename to webapps/evoadmin-web/templates/web-add.conf.j2 diff --git a/evoadmin/templates/web-mail.tpl.j2 b/webapps/evoadmin-web/templates/web-mail.tpl.j2 similarity index 100% rename from evoadmin/templates/web-mail.tpl.j2 rename to webapps/evoadmin-web/templates/web-mail.tpl.j2