From: Peter Palfrader Date: Thu, 25 Jan 2018 20:49:40 +0000 (+0100) Subject: ProxyPass everything so we can set nocanon (re: RT#7057) X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=0577159b575a9f241d5a9be268285008e9366bf7;hp=1d05cfc54ae8220f54dafa64659f830ed2889bea;p=mirror%2Fdsa-puppet.git ProxyPass everything so we can set nocanon (re: RT#7057) --- 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