From: Tom Hughes <tom@compton.nu>
Date: Thu, 29 Sep 2016 15:54:19 +0000 (+0100)
Subject: Disable cgiwrap support on errol
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/904c9868df60d82a048f38227279534abeba4717

Disable cgiwrap support on errol
---

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index b3fdd008b..d5e9cfdc8 100644
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -29,7 +29,7 @@ include_recipe "postgresql"
 
 package "php"
 package "php-cgi"
-package "php-cgiwrap"
+# package "php-cgiwrap"
 package "php-cli"
 package "php-curl"
 package "php-db"
diff --git a/cookbooks/dev/templates/default/apache.user.erb b/cookbooks/dev/templates/default/apache.user.erb
index 37ba4e460..a63829afb 100644
--- a/cookbooks/dev/templates/default/apache.user.erb
+++ b/cookbooks/dev/templates/default/apache.user.erb
@@ -22,11 +22,11 @@ WSGIDaemonProcess <%= @user %>.dev.openstreetmap.org user=<%= @user %> inactivit
 	CustomLog /var/log/apache2/<%= @user %>.dev.openstreetmap.org-access.log combined
 	ErrorLog /var/log/apache2/<%= @user %>.dev.openstreetmap.org-error.log
 
-	RewriteCond <%= @directory %>%{REQUEST_FILENAME} -f
-	RewriteRule ^/cgi-bin/(.*)$ /cgi-bin/cgiwrap/~<%= @user %>/cgi-bin/$1 [PT,L]
+#	RewriteCond <%= @directory %>%{REQUEST_FILENAME} -f
+#	RewriteRule ^/cgi-bin/(.*)$ /cgi-bin/cgiwrap/~<%= @user %>/cgi-bin/$1 [PT,L]
 
-	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]
 
         RewriteCond <%= @directory %>%{REQUEST_FILENAME} -f
 	RewriteRule ^/(.*\.ph(p|ps|p3|tml)(/.*)?)$ fcgi://127.0.0.1:<%= @port %><%= @directory %>/$1 [P]