Note that exim contains tracker-specific configuration

[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 106dfa5..2b2ab6c 100644 (file)
--- a/modules/salsa/templates/apache-salsa.debian.org.conf.erb
+++ b/modules/salsa/templates/apache-salsa.debian.org.conf.erb
@@ -12,17 +12,21 @@ 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
+       <Directory /srv/salsa.debian.org/gitlab/public>
+               Require all granted
+       </Directory>
 
        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