X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsalsa%2Ftemplates%2Fapache-salsa.debian.org.conf.erb;h=2b2ab6cdc14991ad32c2151e05e8975d3f8a20bb;hb=cd460754b2216a0531071902e1412024c594d72c;hp=176db7e42526307ed260635c425cdf748361aee6;hpb=9d36741cc74488acb097a6540bda874f1eb41040;p=mirror%2Fdsa-puppet.git

diff --git a/modules/salsa/templates/apache-salsa.debian.org.conf.erb b/modules/salsa/templates/apache-salsa.debian.org.conf.erb
index 176db7e42..2b2ab6cdc 100644
--- a/modules/salsa/templates/apache-salsa.debian.org.conf.erb
+++ b/modules/salsa/templates/apache-salsa.debian.org.conf.erb
@@ -19,13 +19,14 @@ Use common-debian-service-https-redirect * salsa.debian.org
 	ProxyPreserveHost On
 	AllowEncodedSlashes NoDecode
 
+	ProxyPass / http://127.0.0.1:8181/ retry=10 nocanon
 	ProxyPassReverse / http://127.0.0.1:8181/
 	ProxyPassReverse / http://salsa.debian.org/
 
-	RewriteEngine on
-	RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f [OR]
-	RewriteCond %{REQUEST_URI} ^/uploads/.*
-	RewriteRule .* http://127.0.0.1:8181%{REQUEST_URI} [P,QSA,NE]
+	#RewriteEngine on
+	#RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f [OR]
+	#RewriteCond %{REQUEST_URI} ^/uploads/.*
+	#RewriteRule .* http://127.0.0.1:8181%{REQUEST_URI} [P,QSA,NE]
 
 	RequestHeader set X_FORWARDED_PROTO 'https'
 	RequestHeader set X-Forwarded-Ssl on