diff --git a/.devilbox/etc/apache-2.2/00-php-fpm.conf b/.devilbox/etc/apache-2.2/00-php-fpm.conf new file mode 100644 index 00000000..0f31ac90 --- /dev/null +++ b/.devilbox/etc/apache-2.2/00-php-fpm.conf @@ -0,0 +1,6 @@ +#### PHP-FPM config #### + +AddType application/x-httpd-fastphp5 .php +Action application/x-httpd-fastphp5 /php5-fcgi +Alias /php5-fcgi /usr/local/bin/php-fcgi +FastCgiExternalServer /usr/local/bin/php-fcgi -host 172.16.238.11:9000 -pass-header Authorization \ No newline at end of file diff --git a/.devilbox/etc/apache-2.4/00-php-fpm.conf b/.devilbox/etc/apache-2.4/00-php-fpm.conf new file mode 100644 index 00000000..9aac489e --- /dev/null +++ b/.devilbox/etc/apache-2.4/00-php-fpm.conf @@ -0,0 +1,17 @@ +#### PHP-FPM config #### + +# enablereuse +# Defining a worker will improve performance +# And in this case, re-use the worker (dependent on support from the fcgi application) +# If you have enough idle workers, this would only improve the performance marginally +# +# enablereuse requires Apache 2.4.11 or later +# + + Require all granted + # Pick one of the following approaches + # Use the standard TCP socket + SetHandler "proxy:fcgi://172.16.238.11:9000" + # If your version of httpd is 2.4.9 or newer (or has the back-ported feature), you can use the unix domain socket + #SetHandler "proxy:unix:/path/to/app.sock|fcgi://localhost/:9000" + diff --git a/.devilbox/www/htdocs/vendor/phpmyadmin/config.inc.php b/.devilbox/www/htdocs/vendor/phpmyadmin/config.inc.php index 2ca0a59c..2ae68939 100644 --- a/.devilbox/www/htdocs/vendor/phpmyadmin/config.inc.php +++ b/.devilbox/www/htdocs/vendor/phpmyadmin/config.inc.php @@ -14,7 +14,7 @@ * This is needed for cookie based authentication to encrypt password in * cookie. Needs to be 32 chars long. */ -$cfg['blowfish_secret'] = 'GOgot69FCjkfuDU%^8p_h'; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */ +$cfg['blowfish_secret'] = 'GObO60^(04#^5637%fdUGo(*6$%6#dy40)_hgD>mbX6$%got69FCjkfuDU%^8p_h'; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */ /** * Servers configuration diff --git a/docker-compose.yml b/docker-compose.yml index 0cf81949..dc42a3ac 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -95,8 +95,6 @@ services: links: # ---- Format: ---- # SERVICE [ : ALIAS] - - - "db:database" - "php:php-fpm" @@ -178,6 +176,12 @@ services: - ${HOST_PATH_TO_WWW_DOCROOTS}:/shared/httpd + links: + # ---- Format: ---- + # SERVICE [ : ALIAS] + - "db:database" + + # ---------------------------------------- # DATABASE diff --git a/env-example b/env-example index 0eeef641..7736fb6c 100644 --- a/env-example +++ b/env-example @@ -47,8 +47,8 @@ HTTPD_SERVER=nginx-stable ### MYSQL_SERVER=mysql-5.5 -MYSQL_SERVER=mysql-5.6 -MYSQL_SERVER=mysql-5.7 +#MYSQL_SERVER=mysql-5.6 +#MYSQL_SERVER=mysql-5.7 ###