From 90a65d809092ad723058237adafb1f71c56ec28d Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 6 May 2017 14:17:50 +0200 Subject: [PATCH] REL-0.9 Use hostnames instead of IP addresses --- .devilbox/etc/apache-2.2/00-php-fpm.conf | 2 +- .devilbox/etc/apache-2.4/00-php-fpm.conf | 4 ++-- .devilbox/etc/nginx-mainline/01-vhost-default.conf | 2 +- .devilbox/etc/nginx-mainline/02-vhost-mass.conf | 2 +- .devilbox/etc/nginx-stable/01-vhost-default.conf | 2 +- .devilbox/etc/nginx-stable/02-vhost-mass.conf | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.devilbox/etc/apache-2.2/00-php-fpm.conf b/.devilbox/etc/apache-2.2/00-php-fpm.conf index 0f31ac90..56704025 100644 --- a/.devilbox/etc/apache-2.2/00-php-fpm.conf +++ b/.devilbox/etc/apache-2.2/00-php-fpm.conf @@ -3,4 +3,4 @@ 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 +FastCgiExternalServer /usr/local/bin/php-fcgi -host php:9000 -pass-header Authorization diff --git a/.devilbox/etc/apache-2.4/00-php-fpm.conf b/.devilbox/etc/apache-2.4/00-php-fpm.conf index 9aac489e..cfa00376 100644 --- a/.devilbox/etc/apache-2.4/00-php-fpm.conf +++ b/.devilbox/etc/apache-2.4/00-php-fpm.conf @@ -6,12 +6,12 @@ # 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" + SetHandler "proxy:fcgi://php: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/etc/nginx-mainline/01-vhost-default.conf b/.devilbox/etc/nginx-mainline/01-vhost-default.conf index 1efaee5f..0d035abc 100644 --- a/.devilbox/etc/nginx-mainline/01-vhost-default.conf +++ b/.devilbox/etc/nginx-mainline/01-vhost-default.conf @@ -35,7 +35,7 @@ server { fastcgi_split_path_info ^(.+\.php)(.*)$; #### FPM Server - fastcgi_pass 172.16.238.11:9000; + fastcgi_pass php:9000; fastcgi_index index.php; fastcgi_intercept_errors on; diff --git a/.devilbox/etc/nginx-mainline/02-vhost-mass.conf b/.devilbox/etc/nginx-mainline/02-vhost-mass.conf index ae45ac9c..85cd1123 100644 --- a/.devilbox/etc/nginx-mainline/02-vhost-mass.conf +++ b/.devilbox/etc/nginx-mainline/02-vhost-mass.conf @@ -35,7 +35,7 @@ server { fastcgi_split_path_info ^(.+\.php)(.*)$; #### SOCKET - fastcgi_pass 172.16.238.11:9000; + fastcgi_pass php:9000; fastcgi_index index.php; fastcgi_intercept_errors on; diff --git a/.devilbox/etc/nginx-stable/01-vhost-default.conf b/.devilbox/etc/nginx-stable/01-vhost-default.conf index 39ce9acb..fe4970de 100644 --- a/.devilbox/etc/nginx-stable/01-vhost-default.conf +++ b/.devilbox/etc/nginx-stable/01-vhost-default.conf @@ -35,7 +35,7 @@ server { fastcgi_split_path_info ^(.+\.php)(.*)$; #### FPM Server - fastcgi_pass 172.16.238.11:9000; + fastcgi_pass php:9000; fastcgi_index index.php; fastcgi_intercept_errors on; diff --git a/.devilbox/etc/nginx-stable/02-vhost-mass.conf b/.devilbox/etc/nginx-stable/02-vhost-mass.conf index 4deb308c..661b1747 100644 --- a/.devilbox/etc/nginx-stable/02-vhost-mass.conf +++ b/.devilbox/etc/nginx-stable/02-vhost-mass.conf @@ -35,7 +35,7 @@ server { fastcgi_split_path_info ^(.+\.php)(.*)$; #### SOCKET - fastcgi_pass 172.16.238.11:9000; + fastcgi_pass php:9000; fastcgi_index index.php; fastcgi_intercept_errors on;