Simplified provisioning

Needs VERSION 4 docker images

Author: mblaschke

provision/roles/boilerplate-main-development/defaults/main.yml

@@ -1,2 +1,3 @@
 ---
-  PROVISION_CONTEXT: "{{ lookup('env','PROVISION_CONTEXT') }}"
+
+PROVISION_CONTEXT: "{{ lookup('env','PROVISION_CONTEXT') }}"

provision/roles/boilerplate-main/defaults/main.yml

@@ -1,2 +1,3 @@
 ---
-  PROVISION_CONTEXT: "{{ lookup('env','PROVISION_CONTEXT') }}"
+
+PROVISION_CONTEXT: "{{ lookup('env','PROVISION_CONTEXT') }}"

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

@@ -5,27 +5,6 @@
 
 - include_vars: "/opt/docker/etc/application.{{ PROVISION_CONTEXT }}.yml"
 
-- stat: path=/usr/sbin/php-fpm7.0
-  register: php7_debian
-
-- name: Fact - php5 [RedHat family]
-  set_fact:
-     php_pool_conf: /etc/php-fpm.d/www.conf
-     php_base_path: false
-  when: ansible_os_family == 'RedHat'
-
-- name: Fact - php5 [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 [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
 #############################
@@ -38,21 +17,20 @@
 
 - include: bootstrap/composer.yml
   when: PROVISION.install.phpComposer is defined and PROVISION.install.phpComposer
+
 - include: bootstrap/cron.yml
+
 - include: bootstrap/dnsmasq.yml
   when: DNS is defined
+
 - include: bootstrap/postfix.yml
   when: MAIL is defined
 
-- include: bootstrap/php.redhat.yml php_base_path="{{ php_base_path }}"
-  when: ansible_os_family == 'RedHat'
-
-- include: bootstrap/php.debian.yml php_base_path="{{ php_base_path }}"
-  when: ansible_os_family == 'Debian'
-
-- include: bootstrap/php.yml php_pool_conf="{{ php_pool_conf }}"
+- include: bootstrap/php.yml
 
 - include: bootstrap/web.apache.yml
+
 - include: bootstrap/web.apache.pagespeed.yml
   when: PROVISION.install.apacheModPagespeed is defined and PROVISION.install.apacheModPagespeed
+
 - include: bootstrap/web.nginx.yml

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

@@ -9,4 +9,4 @@
     line:   'address=/{{ item.domain }}/{{ item.address }}'
     create: yes
   with_items: "{{ DNS.domain }}"
-  when: DNS.domain  is defined
+  when: DNS.domain is defined

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

@@ -4,8 +4,32 @@
 
 - name: Configure php-fpm (pool www.conf)
   lineinfile:
-    dest:   "{{ php_pool_conf }}"
+    dest:   "/opt/docker/etc/php/fpm/pool.d/application.conf"
     regexp: '^[\s;]*{{ item.variable }}[\s]*='
     line:   '{{ item.variable }} = {{ item.value }}'
   with_items: "{{ PHP.fpm.conf }}"
   when: PHP.fpm.conf is defined and item.value != ""
+
+- name: Configure php-fpm (php-fpm.conf)
+  lineinfile:
+    dest:    "/opt/docker/etc/php/fpm/php-fpm.conf"
+    regexp: '^[\s;]*{{ item.key }}[\s]*='
+    line:   '{{ item.key }} = {{ item.value }}'
+  with_items:
+   - { key: 'daemonize', value: 'no' }
+
+- name: Set development environment php.ini
+  file:
+    src:  '/opt/docker/etc/php/development.ini'
+    dest: '/opt/docker/etc/php/php.ini'
+    state: link
+    force: yes
+  when: PROVISION_CONTEXT == "development"
+
+- name: Enable production environment php.ini
+  file:
+    src:  '/opt/docker/etc/php/production.ini'
+    dest: '/opt/docker/etc/php/php.ini'
+    state: link
+    force: yes
+  when: PROVISION_CONTEXT == "production" or PROVISION_CONTEXT == ""

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

@@ -1,30 +1,4 @@
 ---
 
-#############################
-# 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 php_pool_conf="{{ php_pool_conf }}"
+- include: entrypoint/php.yml

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

@@ -5,24 +5,8 @@
 
 - name: Configure environment variables from DOCKER_ENVIRONMENT for php-fpm (pool www.conf)
   lineinfile:
-    dest:   "{{ php_pool_conf }}"
+    dest:   "/opt/docker/etc/php/fpm/pool.d/application.conf"
     regexp: '^env\[{{ item.key }}\][\s]*='
     line:   'env[{{ item.key }}] = "{{ item.value }}"'
   with_dict: "{{ DOCKER_ENVIRONMENT }}"
   when: DOCKER_ENVIRONMENT is defined and item.value != ''
-
-- name: Set development environment php.ini
-  file:
-    src:  '/opt/docker/etc/php/development.ini'
-    dest: '/opt/docker/etc/php/php.ini'
-    state: link
-    force: yes
-  when: PROVISION_CONTEXT == "development" or PROVISION_CONTEXT == ""
-
-- name: Enable production environment php.ini
-  file:
-    src:  '/opt/docker/etc/php/production.ini'
-    dest: '/opt/docker/etc/php/php.ini'
-    state: link
-    force: yes
-  when: PROVISION_CONTEXT == "production"