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=4ddddaa2fa2acaf25a8d128f5abff5bd79a01f7d;hp=e849856c0d9b1259e51f1d593366ea10104eafd6;hpb=95805abb6fa434cdeb0f01d2aab38c02ef6b06fd;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 e849856c0..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
 
-	ProxyPassReverse / http://127.0.0.1:8080/
+	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:8080%{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