Feature/cleanup provision

Dockerfile.cloud

@@ -53,7 +53,7 @@ COPY provision/       /opt/docker/provision/
 
 COPY app/             /app/
 
-RUN /opt/docker/bin/provision add --tag bootstrap --tag entrypoint boilerplate-main boilerplate-deployment \
+RUN /opt/docker/bin/provision run --tag bootstrap --role boilerplate-main --role boilerplate-deployment \
     && /opt/docker/bin/bootstrap.sh
 
 # Configure volume/workdir

Dockerfile.development

@@ -51,7 +51,7 @@ ENV PROVISION_CONTEXT "development"
 COPY etc/             /opt/docker/etc/
 COPY provision/       /opt/docker/provision/
 
-RUN /opt/docker/bin/provision add --tag bootstrap --tag entrypoint boilerplate-main boilerplate-main-development boilerplate-deployment \
+RUN /opt/docker/bin/provision run --tag bootstrap --role boilerplate-main --role boilerplate-main-development --role boilerplate-deployment \
     && /opt/docker/bin/bootstrap.sh
 
 # Configure volume/workdir

Dockerfile.production

@@ -51,7 +51,7 @@ ENV PROVISION_CONTEXT "production"
 COPY etc/             /opt/docker/etc/
 COPY provision/       /opt/docker/provision/
 
-RUN /opt/docker/bin/provision add --tag bootstrap --tag entrypoint boilerplate-main boilerplate-deployment \
+RUN /opt/docker/bin/provision run --tag bootstrap --role boilerplate-main --role boilerplate-deployment \
     && /opt/docker/bin/bootstrap.sh
 
 # Configure volume/workdir

documentation/docs/index.rst

@@ -18,7 +18,7 @@ Overview
 
 .. toctree::
 
-   Back to Project Overview <http://webdevops-documentation.readthedocs.org/en/latest/>
+   Back to Project Overview <http://webdevops-documentation.readthedocs.io/en/latest/>
    content/introduction
 
 .. toctree::

etc/application.development.yml

@@ -1,8 +1,6 @@
 ---
 
 PROVISION:
-  systemUpdate: false
-
   install:
     apacheModPagespeed: false
 
@@ -28,6 +26,9 @@ MAIL:
     # - { variable: "relayhost", value: "foobar" }
 
 PHP:
+  # PHP debugger [xdebug or blackfire or none]
+  debugger: "xdebug"
+
   fpm:
     conf:
     # PM

etc/application.production.yml

@@ -1,8 +1,6 @@
 ---
 
 PROVISION:
-  systemUpdate: true
-
   install:
     apacheModPagespeed: false
 

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

@@ -1,7 +1,7 @@
 ---
 
-- include: bootstrap/php-blackfire/debian.yml
-  when: ansible_distribution == 'CentOS' and PROVISION.install.phpBlackfire is defined and PROVISION.install.phpBlackfire
+- include: bootstrap/php-debugger.blackfire.yml
+  when: PHP.debugger is defined and PHP.debugger == "blackfire"
 
-- include: bootstrap/php-blackfire/redhat.yml
-  when: ansible_os_family == 'Debian' and PROVISION.install.phpBlackfire is defined and PROVISION.install.phpBlackfire
+- include: bootstrap/php-debugger.none.yml
+  when: PHP.debugger is not defined or PHP.debugger == "" or PHP.debugger == "none"

provision/roles/boilerplate-main-development/tasks/bootstrap/php-debugger.blackfire.yml

@@ -0,0 +1,41 @@
+---
+
+- name: Disable xdebug
+  replace:
+    dest:     '{{ item }}'
+    regexp:   '^[;\s]*((zend_)?(extension=))'
+    replace:  ';\1'
+  ignore_errors: yes
+  with_items:
+   # RedHat
+   - "/etc/php.d/xdebug.ini"
+   # Debian - PHP 5.x
+   - "/etc/php5/mods-available/xdebug.ini"
+   - "/etc/php5/cli/conf.d/20-xdebug.ini"
+   - "/etc/php5/cli/conf.d/xdebug.ini"
+   - "/etc/php5/fpm/conf.d/20-xdebug.ini"
+   - "/etc/php5/fpm/conf.d/xdebug.ini"
+   # Debian - PHP 7.x
+   - "/etc/php/7.0/mods-available/xdebug.ini"
+   - "/etc/php/7.0/cli/conf.d/20-xdebug.ini"
+   - "/etc/php/7.0/fpm/conf.d/20-xdebug.ini"
+
+- name: Enable blackfire
+  replace:
+    dest:     '{{ item }}'
+    regexp:   '^[;\s]*((zend_)?(extension=))'
+    replace:  '\1'
+  ignore_errors: yes
+  with_items:
+    # RedHat
+    - "/etc/php.d/zz-blackfire.ini"
+    # Debian - PHP 5.x
+    - "/etc/php5/conf.d/90-blackfire.ini"
+    - "/etc/php5/conf.d/zz-blackfire.ini"
+    - "/etc/php5/cli/conf.d/90-blackfire.ini"
+    - "/etc/php5/cli/conf.d/zz-blackfire.ini"
+    - "/etc/php5/fpm/conf.d/90-blackfire.ini"
+    - "/etc/php5/fpm/conf.d/zz-blackfire.ini"
+    # Debian - PHP 7.x
+    - "/etc/php/7.0/cli/conf.d/90-blackfire.ini"
+    - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini"

provision/roles/boilerplate-main-development/tasks/bootstrap/php-debugger.none.yml

@@ -0,0 +1,41 @@
+---
+
+- name: Disable xdebug
+  replace:
+    dest:     '{{ item }}'
+    regexp:   '^[;\s]*((zend_)?(extension=))'
+    replace:  ';\1'
+  ignore_errors: yes
+  with_items:
+   # RedHat
+   - "/etc/php.d/xdebug.ini"
+   # Debian - PHP 5.x
+   - "/etc/php5/mods-available/xdebug.ini"
+   - "/etc/php5/cli/conf.d/20-xdebug.ini"
+   - "/etc/php5/cli/conf.d/xdebug.ini"
+   - "/etc/php5/fpm/conf.d/20-xdebug.ini"
+   - "/etc/php5/fpm/conf.d/xdebug.ini"
+   # Debian - PHP 7.x
+   - "/etc/php/7.0/mods-available/xdebug.ini"
+   - "/etc/php/7.0/cli/conf.d/20-xdebug.ini"
+   - "/etc/php/7.0/fpm/conf.d/20-xdebug.ini"
+
+- name: Disable blackfire
+  replace:
+    dest:     '{{ item }}'
+    regexp:   '^[;\s]*((zend_)?(extension=))'
+    replace:  ';\1'
+  ignore_errors: yes
+  with_items:
+    # RedHat
+    - "/etc/php.d/zz-blackfire.ini"
+    # Debian - PHP 5.x
+    - "/etc/php5/conf.d/90-blackfire.ini"
+    - "/etc/php5/conf.d/zz-blackfire.ini"
+    - "/etc/php5/cli/conf.d/90-blackfire.ini"
+    - "/etc/php5/cli/conf.d/zz-blackfire.ini"
+    - "/etc/php5/fpm/conf.d/90-blackfire.ini"
+    - "/etc/php5/fpm/conf.d/zz-blackfire.ini"
+    # Debian - PHP 7.x
+    - "/etc/php/7.0/cli/conf.d/90-blackfire.ini"
+    - "/etc/php/7.0/fpm/conf.d/90-blackfire.ini"

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

@@ -9,15 +9,6 @@
 # Run tasks
 #############################
 
-- include: bootstrap/systemUpdate.centos.yml
-  when: PROVISION.systemUpdate is defined and PROVISION.systemUpdate and ansible_distribution == 'CentOS'
-
-- include: bootstrap/systemUpdate.ubuntu.yml
-  when: PROVISION.systemUpdate is defined and PROVISION.systemUpdate and ansible_distribution == 'Ubuntu'
-
-- include: bootstrap/composer.yml
-  when: PROVISION.install.phpComposer is defined and PROVISION.install.phpComposer
-
 - include: bootstrap/services.yml
 
 - include: bootstrap/cron.yml

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

@@ -2,13 +2,30 @@
 
 - include_vars: "/opt/docker/etc/application.{{ PROVISION_CONTEXT }}.yml"
 
+#############################
+# Stats
+#############################
+
+- stat:
+    path:   /opt/docker/etc/php/fpm/php-fpm.conf
+  register: phpFpmConf
+
+- stat:
+    path:   /opt/docker/etc/php/fpm/pool.d/application.conf
+  register: phpFpmApplicationPool
+
+#############################
+# Tasks
+#############################
+
 - name: Configure php-fpm (pool www.conf)
   lineinfile:
     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 != ""
+  when: PHP.fpm.conf is defined and item.value != "" and
+        phpFpmApplicationPool.stat.exists is defined and phpFpmApplicationPool.stat.exists
 
 - name: Configure php-fpm (php-fpm.conf)
   lineinfile:
@@ -17,6 +34,7 @@
     line:   '{{ item.key }} = {{ item.value }}'
   with_items:
    - { key: 'daemonize', value: 'no' }
+  when: phpFpmConf.stat.exists is defined and phpFpmConf.stat.exists
 
 - name: Set development environment php.ini
   file:

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

@@ -3,7 +3,3 @@
 - include: bootstrap.yml
   tags:
     - bootstrap
-
-- include: entrypoint.yml
-  tags:
-    - entrypoint