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=bd1a88aaef5c26acff45589301784f7bc439a423;hp=d6e9a96cfac266b0e7e1745dbd84b31cfba611ec;hpb=9e1f74ad62a130347719115d4248d0dc1170d0c2;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 d6e9a96cf..2b2ab6cdc 100644 --- a/modules/salsa/templates/apache-salsa.debian.org.conf.erb +++ b/modules/salsa/templates/apache-salsa.debian.org.conf.erb @@ -11,8 +11,31 @@ Use common-debian-service-https-redirect * salsa.debian.org ErrorLog /var/log/apache2/salsa.debian.org-error.log CustomLog /var/log/apache2/salsa.debian.org-access.log privacy - ProxyPass / http://127.0.0.1:8080/ retry=15 - ProxyPassReverse / http://127.0.0.1:8080/ + DocumentRoot /srv/salsa.debian.org/gitlab/public + + Require all granted + + + 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] + + RequestHeader set X_FORWARDED_PROTO 'https' + RequestHeader set X-Forwarded-Ssl on + + ErrorDocument 404 /404.html + ErrorDocument 422 /422.html + ErrorDocument 500 /500.html + ErrorDocument 502 /502.html + ErrorDocument 503 /503.html # vim:set syn=apache: