From 43e0f7589f29944bc1be2a217e018e1daa80fd92 Mon Sep 17 00:00:00 2001
From: Gregory Colpart <gcolpart+git@evolix.fr>
Date: Tue, 22 Aug 2017 06:09:58 +0200
Subject: [PATCH] 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