Fixup phppgadmin for proxy_fcgi

diff --git a/cookbooks/dev/templates/default/apache.phppgadmin.erb b/cookbooks/dev/templates/default/apache.phppgadmin.erb
index e2d8556f7ad0b362cc4c8c4df8cd4ee16d799ca1..b6a7f9197284ee5de56b7ca83464cac08a97471f 100644 (file)
--- a/cookbooks/dev/templates/default/apache.phppgadmin.erb
+++ b/cookbooks/dev/templates/default/apache.phppgadmin.erb
@@ -9,12 +9,7 @@
 
        DocumentRoot /usr/share/phppgadmin
 
 
        DocumentRoot /usr/share/phppgadmin
 

-       <IfModule mod_fastcgi_handler.c>
-               <FilesMatch "\.ph(p3?|tml)$">
-                       SetHandler fcgi:/var/run/php5-fpm-default.sock
-               </FilesMatch>
-               <FilesMatch "\.phps$">
-                       SetHandler fcgi:/var/run/php5-fpm-default.sock
-               </FilesMatch>
-       </IfModule>
+       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

 </VirtualHost>
 </VirtualHost>

diff --git a/cookbooks/dev/templates/default/fpm-default.conf.erb b/cookbooks/dev/templates/default/fpm-default.conf.erb
index 68afd01e93643fd78b7a260a056d50886007bc32..fe7ee4c407ae29267e98a4e41cc79cf0802fd40c 100644 (file)
--- 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.
 ;                            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)
 
 ; 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
 ; 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
  
 ; List of ipv4 addresses of FastCGI clients which are allowed to connect.
 ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original