From: Tom Hughes Date: Wed, 9 Mar 2016 16:30:03 +0000 (+0000) Subject: Fixup phppgadmin for proxy_fcgi X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/757b7e227f73c7fcad7d9f61d24d58636d69f1d9?ds=sidebyside Fixup phppgadmin for proxy_fcgi --- diff --git a/cookbooks/dev/templates/default/apache.phppgadmin.erb b/cookbooks/dev/templates/default/apache.phppgadmin.erb index e2d8556f7..b6a7f9197 100644 --- a/cookbooks/dev/templates/default/apache.phppgadmin.erb +++ b/cookbooks/dev/templates/default/apache.phppgadmin.erb @@ -9,12 +9,7 @@ DocumentRoot /usr/share/phppgadmin - - - SetHandler fcgi:/var/run/php5-fpm-default.sock - - - SetHandler fcgi:/var/run/php5-fpm-default.sock - - + ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:7000/usr/share/phppgadmin + ProxyPassMatch ^/(.*\.phpx(/.*)?)$ fcgi://127.0.0.1:7000/usr/share/phppgadmin + ProxyPassMatch ^/(.*\.phpj(/.*)?)$ fcgi://127.0.0.1:7000/usr/share/phppgadmin diff --git a/cookbooks/dev/templates/default/fpm-default.conf.erb b/cookbooks/dev/templates/default/fpm-default.conf.erb index 68afd01e9..fe7ee4c40 100644 --- a/cookbooks/dev/templates/default/fpm-default.conf.erb +++ b/cookbooks/dev/templates/default/fpm-default.conf.erb @@ -30,7 +30,7 @@ group = www-data ; specific port; ; '/path/to/unix/socket' - to listen on a unix socket. ; Note: This value is mandatory. -listen = /var/run/php5-fpm-default.sock +listen = 127.0.0.1:7000 ; Set listen(2) backlog. A value of '-1' means unlimited. ; Default Value: 128 (-1 on FreeBSD and OpenBSD) @@ -41,9 +41,9 @@ listen = /var/run/php5-fpm-default.sock ; BSD-derived systems allow connections regardless of permissions. ; Default Values: user and group are set as the running user ; mode is set to 0666 -listen.owner = www-data -listen.group = www-data -listen.mode = 0660 +;listen.owner = www-data +;listen.group = www-data +;listen.mode = 0660 ; List of ipv4 addresses of FastCGI clients which are allowed to connect. ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original