Add ability for user-defined PHP config

.gitignore

@@ -17,7 +17,19 @@
 log/
 run/
 
+# Ignore custom MySQL configs
 cfg/mysql-5.5/*.cnf
+cfg/mysql-5.6/*.cnf
+cfg/mysql-5.7/*.cnf
+cfg/mariadb-5/*.cnf
+cfg/mariadb-10/*.cnf
+
+# Ignore custom PHP-FPM configs
+cfg/php-fpm-5.4/*.ini
+cfg/php-fpm-5.5/*.ini
+cfg/php-fpm-5.6/*.ini
+cfg/php-fpm-7.0/*.ini
+cfg/php-fpm-7.1/*.ini
 
 
 

cfg/php-fpm-5.6/devilbox-custom.ini-example

@@ -0,0 +1,18 @@
+[PHP]
+; Memory
+memory_limit			= 4096M
+
+; Timeouts
+max_execution_time		= 180
+max_input_time			= 180
+; Uploads
+post_max_size			= 1990M
+upload_max_filesize		= 1990M
+
+; Vars
+max_input_vars			= 8000
+
+; Error reporting
+error_reporting			= E_ALL
+display_errors			= On
+track_errors			= On

docker-compose.yml

@@ -73,16 +73,16 @@ services:
             # Custom scripts/binaries required for httpd server vhost
             # configuration to work.
             # (configured in /etc/${HTTPD_SERVER}/02-vhost-mass.conf)
-            - ./base/bin/${HTTPD_SERVER}:/opt/bin
+            - ./.devilbox/bin/${HTTPD_SERVER}:/opt/bin
 
             # Mount user-defined httpd configuration files
             # @see environment::CUSTOM_HTTPD_CONF_DIR for how this
             # is added in httpd server
-            - ./base/etc/${HTTPD_SERVER}:/etc/${HTTPD_SERVER}
+            - ./.devilbox/etc/${HTTPD_SERVER}:/etc/${HTTPD_SERVER}
 
             # Mount custom intranet
             # (configured in /etc/${HTTPD_SERVER}/01-vhost-default.conf)
-            - ./base/www:/var/www/default
+            - ./.devilbox/www:/var/www/default
 
             # Mount user-defined httpd log
             # @see ./etc/${HTTPD_SERVER}/*.conf for log defines
@@ -121,11 +121,6 @@ services:
             # Adjust timezone
             - TIMEZONE=${TIMEZONE}
 
-            ##
-            ## PHP-FPM Listening Port
-            ##
-            - PHP_FPM_PORT=9000
-
             ##
             ## PHP Xdebug
             ##
@@ -133,22 +128,6 @@ services:
             - PHP_XDEBUG_REMOTE_PORT=${PHP_XDEBUG_REMOTE_PORT}
             - PHP_XDEBUG_REMOTE_HOST=${PHP_XDEBUG_REMOTE_HOST}
 
-            ##
-            ## PHP Tweaks
-            ##
-            - PHP_MAX_EXECUTION_TIME=${PHP_MAX_EXECUTION_TIME}
-            - PHP_MAX_INPUT_TIME=${PHP_MAX_INPUT_TIME}
-            - PHP_MEMORY_LIMIT=${PHP_MEMORY_LIMIT}
-            - PHP_POST_MAX_SIZE=${PHP_POST_MAX_SIZE}
-            - PHP_UPLOAD_MAX_FILESIZE=${PHP_UPLOAD_MAX_FILESIZE}
-            - PHP_MAX_INPUT_VARS=${PHP_MAX_INPUT_VARS}
-
-            ###
-            ### PHP Error Handling
-            ###
-            - PHP_ERROR_REPORTING=${PHP_ERROR_REPORTING}
-            - PHP_DISPLAY_ERRORS=${PHP_DISPLAY_ERRORS}
-            - PHP_TRACK_ERRORS=${PHP_TRACK_ERRORS}
 
             ##
             ## Map remote MySQL Port to 127.0.0.1
@@ -181,7 +160,7 @@ services:
 
             # Mount custom intranet
             # (configured in /etc/${HTTPD_SERVER}/01-vhost-default.conf)
-            - ./base/www:/var/www/default
+            - ./.devilbox/www:/var/www/default
 
             # Mount logs
             - ./log/${PHP_SERVER}:/var/log/php-fpm
@@ -189,6 +168,11 @@ services:
             # Mount MySQL Socket directory
             - ./run/mysql:/tmp/mysql
 
+            # Mount devilbox user-defined *.ini files in order
+            # to overwrite the default PHP configuration
+            - ./cfg/${PHP_SERVER}:/etc/php-custom.d
+
+
             # Mount custom mass virtual hosting
             # (configured in /etc/${HTTPD_SERVER}/02-vhost-mass.conf)
             - ${HOST_PATH_TO_WWW_DOCROOTS}:/shared/httpd