Simplified provisioning

Fixed also php7 support

Author: mblaschke

provision/roles/boilerplate-main/tasks/bootstrap.yml

@@ -1,7 +1,34 @@
 ---
+#############################
+# Gather environment stuff
+#############################
 
 - include_vars: "/opt/docker/etc/application.{{ PROVISION_CONTEXT }}.yml"
 
+- stat: path=/usr/sbin/php-fpm7.0
+  register: php7_debian
+
+- name: Fact - php5 pool [RedHat family]
+  set_fact:
+     php_pool_conf: /etc/php-fpm.d/www.conf
+  when: ansible_os_family == 'RedHat'
+
+- name: Fact - php5 pool [Debian family]
+  set_fact:
+     php_pool_conf: /etc/php5/fpm/pool.d/www.conf
+     php_base_path: /etc/php5
+  when: ansible_os_family == 'Debian'
+
+- name: Fact - php7 pool [Debian family]
+  set_fact:
+     php_pool_conf: /etc/php/7.0/fpm/pool.d/www.conf
+     php_base_path: /etc/php/7.0
+  when: ansible_os_family == 'Debian' and php7_debian.stat.exists is defined and php7_debian.stat.exists
+
+#############################
+# Run tasks
+#############################
+
 - include: bootstrap/systemUpdate.centos.yml
   when: PROVISION.systemUpdate is defined and PROVISION.systemUpdate and ansible_distribution == 'CentOS'
 
@@ -16,13 +43,13 @@
 - include: bootstrap/postfix.yml
   when: MAIL is defined
 
-- include: bootstrap/php.centos.yml
-  when: ansible_distribution == 'CentOS'
+- include: bootstrap/php.redhat.yml
+  when: ansible_os_family == 'RedHat'
 
-- include: bootstrap/php.ubuntu.yml
-  when: ansible_distribution == 'Ubuntu' or ansible_distribution == 'Debian'
+- include: bootstrap/php.debian.yml php_base_path="{{ php_base_path }}"
+  when: ansible_os_family == 'Debian'
 
-- include: bootstrap/php.yml
+- include: bootstrap/php.yml php_pool_conf="{{ php_pool_conf }}"
 
 - include: bootstrap/web.apache.yml
 - include: bootstrap/web.nginx.yml

provision/roles/boilerplate-main/tasks/bootstrap/php.ubuntu.yml renamed to provision/roles/boilerplate-main/tasks/bootstrap/php.debian.yml

@@ -2,14 +2,14 @@
 
 - name: Create /etc/php5/mods-available/
   file:
-    path:  /etc/php5/mods-available/
+    path:  "{{ php_base_path }}/mods-available/"
     state: directory
     mode:  0755
 
 - name: Link php.ini for cli and fpm
   file:
     src:  '{{ item.file }}'
-    dest: '/etc/php5/{{ item.category }}/conf.d/{{ item.target }}'
+    dest: '{{ php_base_path }}/{{ item.category }}/conf.d/{{ item.target }}'
     force: yes
     state: link
   with_items:
@@ -22,7 +22,7 @@
 
 - name: Configure php-fpm (php-fpm.conf)
   lineinfile:
-    dest:    /etc/php5/fpm/php-fpm.conf
+    dest:    "{{ php_base_path }}/fpm/php-fpm.conf"
     regexp: '^[\s;]*{{ item.key }}[\s]*='
     line:   '{{ item.key }} = {{ item.value }}'
   with_items:

provision/roles/boilerplate-main/tasks/bootstrap/php.centos.yml renamed to provision/roles/boilerplate-main/tasks/bootstrap/php.redhat.yml

@@ -2,16 +2,6 @@
 
 - include_vars: "/opt/docker/etc/application.{{ PROVISION_CONTEXT }}.yml"
 
-- name: Fact - php pool on centos
-  set_fact:
-     php_pool_conf: /etc/php-fpm.d/www.conf
-  when: ansible_distribution == 'CentOS'
-
-- name: Fact - php pool on ubuntu
-  set_fact:
-     php_pool_conf: /etc/php5/fpm/pool.d/www.conf
-  when: ansible_distribution == 'Ubuntu' or ansible_distribution == 'Debian'
-
 - name: Configure php-fpm (pool www.conf)
   lineinfile:
     dest:   "{{ php_pool_conf }}"

provision/roles/boilerplate-main/tasks/bootstrap/php.yml

@@ -1,4 +1,30 @@
 ---
 
+#############################
+# Gather environment stuff
+#############################
+
+- stat: path=/usr/sbin/php-fpm7.0
+  register: php7_debian
+
+- name: Fact - php5 pool [RedHat family]
+  set_fact:
+     php_pool_conf: /etc/php-fpm.d/www.conf
+  when: ansible_os_family == 'RedHat'
+
+- name: Fact - php5 pool [Debian family]
+  set_fact:
+     php_pool_conf: /etc/php5/fpm/pool.d/www.conf
+  when: ansible_os_family == 'Debian'
+
+- name: Fact - php7 pool [Debian family]
+  set_fact:
+     php_pool_conf: /etc/php/7.0/fpm/pool.d/www.conf
+  when: ansible_os_family == 'Debian' and php7_debian.stat.exists is defined and php7_debian.stat.exists
+
+#############################
+# Run tasks
+#############################
+
 - include: entrypoint/mysql.yml
-- include: entrypoint/php.yml
+- include: entrypoint/php.yml php_pool_conf="{{ php_pool_conf }}"

provision/roles/boilerplate-main/tasks/entrypoint.yml

@@ -3,16 +3,6 @@
 - include_vars: "/opt/docker/etc/application.{{ PROVISION_CONTEXT }}.yml"
 - include_vars: "/opt/docker/etc/application.environment.yml"
 
-- name: Fact - php pool on centos
-  set_fact:
-     php_pool_conf: /etc/php-fpm.d/www.conf
-  when: ansible_distribution == 'CentOS'
-
-- name: Fact - php pool on ubuntu
-  set_fact:
-     php_pool_conf: /etc/php5/fpm/pool.d/www.conf
-  when: ansible_distribution == 'Ubuntu' or ansible_distribution == 'Debian'
-
 - name: Configure environment variables from DOCKER_ENVIRONMENT for php-fpm (pool www.conf)
   lineinfile:
     dest:   "{{ php_pool_conf }}"