From 9aec7c88915960894c4737da77e6bffe619997c9 Mon Sep 17 00:00:00 2001 From: Gregory Colpart Date: Wed, 23 Aug 2017 04:28:21 +0200 Subject: [PATCH] First step to use new evoadmin / FPM --- packweb-apache/defaults/main.yml | 3 +++ packweb-apache/tasks/main.yml | 8 ++++++++ webapps/evoadmin-web/tasks/user.yml | 12 ++++++++++++ 3 files changed, 23 insertions(+) diff --git a/packweb-apache/defaults/main.yml b/packweb-apache/defaults/main.yml index 25c8d6fd..6a2da764 100644 --- a/packweb-apache/defaults/main.yml +++ b/packweb-apache/defaults/main.yml @@ -1,5 +1,8 @@ --- # defaults file for packweb-apache general_alert_email: "root@localhost" + packweb_enable_evoadmin_vhost: True packweb_fhs_retrictions: True +packweb_apache_modphp: True +packweb_apache_fpm: False diff --git a/packweb-apache/tasks/main.yml b/packweb-apache/tasks/main.yml index 764a60f6..cf974547 100644 --- a/packweb-apache/tasks/main.yml +++ b/packweb-apache/tasks/main.yml @@ -14,6 +14,14 @@ name: php vars: php_apache_enable: True + when: packweb_apache_modphp + +- name: Include PHP role + include_role: + name: php + vars: + php_fpm_enable: True + when: packweb_apache_fpm - name: Add elements to user account template file: diff --git a/webapps/evoadmin-web/tasks/user.yml b/webapps/evoadmin-web/tasks/user.yml index 8023777d..00d151ae 100644 --- a/webapps/evoadmin-web/tasks/user.yml +++ b/webapps/evoadmin-web/tasks/user.yml @@ -21,9 +21,21 @@ git: repo: https://forge.evolix.org/evoadmin-web.git dest: "{{ evoadmin_document_root}}" + version: jessie update: no # Warning: Need sudo! become_user: "{{ evoadmin_username }}" + when: ansible_distribution_release == "jessie" + +- name: Clone evoadmin repository + git: + repo: https://forge.evolix.org/evoadmin-web.git + dest: "{{ evoadmin_document_root}}" + version: master + update: yes + # Warning: Need sudo! + become_user: "{{ evoadmin_username }}" + when: ansible_distribution_major_version | version_compare('9', '>=') - include: remount_usr_rw.yml when: evoadmin_scripts_dir | search ("/usr")