www.d.o: move d-i hooks rewrite to d-i.d.o rather than d-i.alioth.d.o

[mirror/dsa-puppet.git] / modules / salsa / templates / apache-salsa.debian.org.conf.erb

diff --git a/modules/salsa/templates/apache-salsa.debian.org.conf.erb b/modules/salsa/templates/apache-salsa.debian.org.conf.erb
index d6e9a96..2b2ab6c 100644 (file)
--- 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
+       <Directory /srv/salsa.debian.org/gitlab/public>
+               Require all granted
+       </Directory>
+
+       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
 </VirtualHost>
 
 # vim:set syn=apache: