Moved php ini files to etc/php/

Author: mblaschke

docker-env.yml

@@ -80,10 +80,6 @@ FTP_PASSWORD=dev
 FTP_PATH=/data/ftp/
 #FTP_PATH=/docker/code/
 
-#######################################
-# PHP Settings
-PHP_TIMEZONE=UTC
-
 #######################################
 # Permission settings
 EFFECTIVE_UID=1000

docker/main/centos/conf/supervisord.conf

@@ -1,6 +1,9 @@
 [supervisord]
 nodaemon=true
 
+[unix_http_server]
+file = /var/tmp/supervisor.sock
+
 [program:php-fpm]
 command = /sbin/php-fpm
 autostart = true

docker/main/centos/provision/roles/php/tasks/configuration.yml

@@ -13,28 +13,20 @@
 
 - name: Set development environment php.ini
   file:
-    src:  '/opt/docker/conf/php.development.ini'
+    src:  '/docker/etc/php/development.ini'
     dest: '/opt/docker/conf/php.ini'
     force: yes
     state: link
   when: PROVISION.CONTEXT == "development" or PROVISION.CONTEXT == ""
 
 - name: Enable production environment php.ini
   file:
-    src:  '/opt/docker/conf/php.production.ini'
+    src:  '/docker/etc/php/production.ini'
     dest: '/opt/docker/conf/php.ini'
     force: yes
     state: link
   when: PROVISION.CONTEXT == "production"
 
-- name: Configure php (docker php.ini)
-  lineinfile:
-    dest:   /opt/docker/conf/php.ini
-    regexp: '^{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'date.timezone', value: '{{ DOCKER.PHP_TIMEZONE }}' }
-
 - name: Truncate log files
   command: 'cp /dev/null {{ item }}'
   with_items:

docker/main/centos/provision/variables.yml

@@ -37,9 +37,6 @@ DOCKER:
   # Mail
   MAIL_GATEWAY: "{{ lookup('env','MAIL_GATEWAY') }}"
 
-  # PHP
-  PHP_TIMEZONE: "{{ lookup('env','PHP_TIMEZONE') }}"
-
   # DNS
   DNS_DOMAIN: "{{ lookup('env','DNS_DOMAIN') }}"
 

docker/main/ubuntu-hhvm/conf/php.ini

@@ -1,6 +1,9 @@
 [supervisord]
 nodaemon=true
 
+[unix_http_server]
+file = /var/tmp/supervisor.sock
+
 [program:hhvm]
 command = /usr/bin/hhvm --mode server -vServer.Type=fastcgi -vServer.Port=9000
 user = www-data

docker/main/ubuntu-hhvm/conf/supervisord.conf

@@ -30,9 +30,6 @@ DOCKER:
   # Mail
   MAIL_GATEWAY: "{{ lookup('env','MAIL_GATEWAY') }}"
 
-  # PHP
-  PHP_TIMEZONE: "{{ lookup('env','PHP_TIMEZONE') }}"
-
   # DNS
   DNS_DOMAIN: "{{ lookup('env','DNS_DOMAIN') }}"
 

docker/main/ubuntu-hhvm/provision/variables.yml

@@ -10,28 +10,20 @@
 
 - name: Set development environment php.ini
   file:
-    src:  '/opt/docker/conf/php.development.ini'
+    src:  '/docker/etc/php/development.ini'
     dest: '/opt/docker/conf/php.ini'
     force: yes
     state: link
   when: PROVISION.CONTEXT == "development" or PROVISION.CONTEXT == ""
 
 - name: Enable production environment php.ini
   file:
-    src:  '/opt/docker/conf/php.production.ini'
+    src:  '/docker/etc/php/production.ini'
     dest: '/opt/docker/conf/php.ini'
     force: yes
     state: link
   when: PROVISION.CONTEXT == "production"
 
-- name: Configure php (docker php.ini)
-  lineinfile:
-    dest:   /opt/docker/conf/php.ini
-    regexp: '^{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'date.timezone', value: '{{ DOCKER.PHP_TIMEZONE }}' }
-
 - name: Truncate log files
   command: 'cp /dev/null {{ item }}'
   with_items: