Fix restarting of chef-client on Ubuntu 15.10 and newer

[chef.git] / cookbooks / dev / templates / default / apache.user.erb

diff --git a/cookbooks/dev/templates/default/apache.user.erb b/cookbooks/dev/templates/default/apache.user.erb
index 9b49158f9f5d2f3a2dab2262a64c2f86b685db2b..f6afd675d0ee873595ce4872e06be6fbc0ff86a1 100644 (file)
--- a/cookbooks/dev/templates/default/apache.user.erb
+++ b/cookbooks/dev/templates/default/apache.user.erb
@@ -14,8 +14,7 @@ WSGIDaemonProcess <%= @user %>.dev.openstreetmap.org user=<%= @user %> inactivit
        WSGIProcessGroup <%= @user %>.dev.openstreetmap.org
 
        RewriteEngine on
        WSGIProcessGroup <%= @user %>.dev.openstreetmap.org
 
        RewriteEngine on

-       #RewriteLog /var/log/apache2/rewrite.log
-       #RewriteLogLevel 4
+       #LogLevel rewrite:trace2

 
        CustomLog /var/log/apache2/<%= @user %>.dev.openstreetmap.org-access.log combined
        ErrorLog /var/log/apache2/<%= @user %>.dev.openstreetmap.org-error.log
 
        CustomLog /var/log/apache2/<%= @user %>.dev.openstreetmap.org-access.log combined
        ErrorLog /var/log/apache2/<%= @user %>.dev.openstreetmap.org-error.log


@@ -26,27 +25,18 @@ WSGIDaemonProcess <%= @user %>.dev.openstreetmap.org user=<%= @user %> inactivit
        RewriteCond <%= @directory %>%{REQUEST_FILENAME} -f
        RewriteRule ^/cgi-bin-d/(.*)$ /cgi-bin/cgiwrapd/~<%= @user %>/cgi-bin/$1 [PT,L]
 
        RewriteCond <%= @directory %>%{REQUEST_FILENAME} -f
        RewriteRule ^/cgi-bin-d/(.*)$ /cgi-bin/cgiwrapd/~<%= @user %>/cgi-bin/$1 [PT,L]
 

-       <IfModule mod_fastcgi_handler.c>
-               <FilesMatch "\.ph(p3?|tml)$">
-                       SetHandler fcgi:/var/run/php5-fpm-<%= @user %>.sock
-               </FilesMatch>
-               <FilesMatch "\.phps$">
-                       SetHandler fcgi:/var/run/php5-fpm-<%= @user %>.sock
-               </FilesMatch>
-       </IfModule>
-
-       <IfModule !mod_fastcgi_handler.c>
-               RewriteCond <%= @directory %>%{REQUEST_FILENAME} -f
-               RewriteRule ^(.*\.php)$ /cgi-bin/php-cgiwrap/~<%= @user %>/$1 [PT,L]
-       </IfModule>
+        RewriteCond <%= @directory %>%{REQUEST_FILENAME} -f
+       RewriteRule ^/(.*\.ph(p|ps|p3|tml)(/.*)?)$ fcgi://127.0.0.1:<%= @port %><%= @directory %>/$1 [P]

 </VirtualHost>
 
 <Directory <%= @directory %>>
        AllowOverride AuthConfig FileInfo Indexes Options=RailsBaseURI
        Options SymLinksIfOwnerMatch Indexes Includes
 </VirtualHost>
 
 <Directory <%= @directory %>>
        AllowOverride AuthConfig FileInfo Indexes Options=RailsBaseURI
        Options SymLinksIfOwnerMatch Indexes Includes

+       Require all granted

 </Directory>
 
 <Directory <%= @directory %>/wsgi-bin>
        SetHandler wsgi-script
        Options ExecCGI SymLinksIfOwnerMatch
 </Directory>
 
 <Directory <%= @directory %>/wsgi-bin>
        SetHandler wsgi-script
        Options ExecCGI SymLinksIfOwnerMatch

+       Require all granted

 </Directory>
 </Directory>