Disable cgiwrap support on errol
authorTom Hughes <tom@compton.nu>
Thu, 29 Sep 2016 15:54:19 +0000 (16:54 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 29 Sep 2016 15:54:19 +0000 (16:54 +0100)
cookbooks/dev/recipes/default.rb
cookbooks/dev/templates/default/apache.user.erb

index b3fdd00..d5e9cfd 100644 (file)
@@ -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"
index 37ba4e4..a63829a 100644 (file)
@@ -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]