diff --git a/base/README.md b/.devilbox/README.md similarity index 100% rename from base/README.md rename to .devilbox/README.md diff --git a/base/bin/apache-2.2/fix-virtual-docroot.php b/.devilbox/bin/apache-2.2/fix-virtual-docroot.php similarity index 100% rename from base/bin/apache-2.2/fix-virtual-docroot.php rename to .devilbox/bin/apache-2.2/fix-virtual-docroot.php diff --git a/base/bin/apache-2.2/splitlogs.php b/.devilbox/bin/apache-2.2/splitlogs.php similarity index 100% rename from base/bin/apache-2.2/splitlogs.php rename to .devilbox/bin/apache-2.2/splitlogs.php diff --git a/base/bin/apache-2.4/fix-virtual-docroot.php b/.devilbox/bin/apache-2.4/fix-virtual-docroot.php similarity index 100% rename from base/bin/apache-2.4/fix-virtual-docroot.php rename to .devilbox/bin/apache-2.4/fix-virtual-docroot.php diff --git a/base/bin/apache-2.4/splitlogs.php b/.devilbox/bin/apache-2.4/splitlogs.php similarity index 100% rename from base/bin/apache-2.4/splitlogs.php rename to .devilbox/bin/apache-2.4/splitlogs.php diff --git a/base/etc/apache-2.2/00-defaults.conf b/.devilbox/etc/apache-2.2/00-defaults.conf similarity index 100% rename from base/etc/apache-2.2/00-defaults.conf rename to .devilbox/etc/apache-2.2/00-defaults.conf diff --git a/base/etc/apache-2.2/01-vhost-default.conf b/.devilbox/etc/apache-2.2/01-vhost-default.conf similarity index 100% rename from base/etc/apache-2.2/01-vhost-default.conf rename to .devilbox/etc/apache-2.2/01-vhost-default.conf diff --git a/base/etc/apache-2.2/02-vhost-mass.conf b/.devilbox/etc/apache-2.2/02-vhost-mass.conf similarity index 100% rename from base/etc/apache-2.2/02-vhost-mass.conf rename to .devilbox/etc/apache-2.2/02-vhost-mass.conf diff --git a/base/etc/apache-2.4/00-defaults.conf b/.devilbox/etc/apache-2.4/00-defaults.conf similarity index 100% rename from base/etc/apache-2.4/00-defaults.conf rename to .devilbox/etc/apache-2.4/00-defaults.conf diff --git a/base/etc/apache-2.4/01-vhost-default.conf b/.devilbox/etc/apache-2.4/01-vhost-default.conf similarity index 100% rename from base/etc/apache-2.4/01-vhost-default.conf rename to .devilbox/etc/apache-2.4/01-vhost-default.conf diff --git a/base/etc/apache-2.4/02-vhost-mass.conf b/.devilbox/etc/apache-2.4/02-vhost-mass.conf similarity index 100% rename from base/etc/apache-2.4/02-vhost-mass.conf rename to .devilbox/etc/apache-2.4/02-vhost-mass.conf diff --git a/base/www/config.php b/.devilbox/www/config.php similarity index 100% rename from base/www/config.php rename to .devilbox/www/config.php diff --git a/base/www/htdocs/_ajax_db.php b/.devilbox/www/htdocs/_ajax_db.php similarity index 100% rename from base/www/htdocs/_ajax_db.php rename to .devilbox/www/htdocs/_ajax_db.php diff --git a/base/www/htdocs/_ajax_vhost.php b/.devilbox/www/htdocs/_ajax_vhost.php similarity index 100% rename from base/www/htdocs/_ajax_vhost.php rename to .devilbox/www/htdocs/_ajax_vhost.php diff --git a/base/www/htdocs/assets/css/custom.css b/.devilbox/www/htdocs/assets/css/custom.css similarity index 100% rename from base/www/htdocs/assets/css/custom.css rename to .devilbox/www/htdocs/assets/css/custom.css diff --git a/base/www/htdocs/databases.php b/.devilbox/www/htdocs/databases.php similarity index 100% rename from base/www/htdocs/databases.php rename to .devilbox/www/htdocs/databases.php diff --git a/base/www/htdocs/index.php b/.devilbox/www/htdocs/index.php similarity index 100% rename from base/www/htdocs/index.php rename to .devilbox/www/htdocs/index.php diff --git a/base/www/htdocs/mysqlinfo.php b/.devilbox/www/htdocs/mysqlinfo.php similarity index 100% rename from base/www/htdocs/mysqlinfo.php rename to .devilbox/www/htdocs/mysqlinfo.php diff --git a/base/www/htdocs/opcache.php b/.devilbox/www/htdocs/opcache.php similarity index 100% rename from base/www/htdocs/opcache.php rename to .devilbox/www/htdocs/opcache.php diff --git a/base/www/htdocs/phpinfo.php b/.devilbox/www/htdocs/phpinfo.php similarity index 100% rename from base/www/htdocs/phpinfo.php rename to .devilbox/www/htdocs/phpinfo.php diff --git a/base/www/htdocs/vhosts.php b/.devilbox/www/htdocs/vhosts.php similarity index 100% rename from base/www/htdocs/vhosts.php rename to .devilbox/www/htdocs/vhosts.php diff --git a/base/www/include/footer.php b/.devilbox/www/include/footer.php similarity index 100% rename from base/www/include/footer.php rename to .devilbox/www/include/footer.php diff --git a/base/www/include/functions.php b/.devilbox/www/include/functions.php similarity index 100% rename from base/www/include/functions.php rename to .devilbox/www/include/functions.php diff --git a/.gitignore b/.gitignore index 5fe1bb81..6f5c8a0f 100644 --- a/.gitignore +++ b/.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 diff --git a/cfg/php-fpm-5.6/devilbox-custom.ini-example b/cfg/php-fpm-5.6/devilbox-custom.ini-example new file mode 100644 index 00000000..0d74166d --- /dev/null +++ b/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 diff --git a/docker-compose.yml b/docker-compose.yml index a6f608fb..0cf81949 100644 --- a/docker-compose.yml +++ b/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