X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/c38035b78dc383306b788267b1452623fa57707b..b3c7c0d36288566eecbabd2570a57b66116d7407:/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 a63829afb..39f1cd60f 100644
--- a/cookbooks/dev/templates/default/apache.user.erb
+++ b/cookbooks/dev/templates/default/apache.user.erb
@@ -22,13 +22,10 @@ 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/(.*)$ /~<%= @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
+	RewriteCond <%= @directory %>%{REQUEST_FILENAME} -f
 	RewriteRule ^/(.*\.ph(p|ps|p3|tml)(/.*)?)$ fcgi://127.0.0.1:<%= @port %><%= @directory %>/$1 [P]
 </VirtualHost>
 
@@ -38,6 +35,12 @@ WSGIDaemonProcess <%= @user %>.dev.openstreetmap.org user=<%= @user %> inactivit
 	Require all granted
 </Directory>
 
+<Directory <%= @directory %>/cgi-bin>
+	SetHandler cgi-script
+	Options ExecCGI SymLinksIfOwnerMatch
+	Require all granted
+</Directory>
+
 <Directory <%= @directory %>/wsgi-bin>
 	SetHandler wsgi-script
 	Options ExecCGI SymLinksIfOwnerMatch