X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsalsa%2Ftemplates%2Fapache-salsa.debian.org.conf.erb;h=176db7e42526307ed260635c425cdf748361aee6;hb=9768916cd03adff997b5306ed0497c31d30f2624;hp=a417e8e4f40910eb6e444e19b2fe2825f81c17d1;hpb=1846d61c55644ac3cd741a5602c27b2cf56d617b;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 a417e8e4f..176db7e42 100644 --- a/modules/salsa/templates/apache-salsa.debian.org.conf.erb +++ b/modules/salsa/templates/apache-salsa.debian.org.conf.erb @@ -12,17 +12,20 @@ Use common-debian-service-https-redirect * salsa.debian.org CustomLog /var/log/apache2/salsa.debian.org-access.log privacy DocumentRoot /srv/salsa.debian.org/gitlab/public + + Require all granted + ProxyPreserveHost On AllowEncodedSlashes NoDecode - ProxyPassReverse http://127.0.0.1:8080/ - ProxyPassReverse http://salsa.debian.org/ + 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] + RewriteRule .* http://127.0.0.1:8181%{REQUEST_URI} [P,QSA,NE] RequestHeader set X_FORWARDED_PROTO 'https' RequestHeader set X-Forwarded-Ssl on