X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsalsa%2Ftemplates%2Fapache-pages.debian.net.conf.erb;h=0f849ed0ad069c95cacde0c982ff41358c5a60c3;hb=1a9fb2fcc67a3a2b811b58669a5e0bfbcef97dbb;hp=e925623f7667b465ddc1dcb7ba1677b2c5c6af9e;hpb=c0df7e3b79a8e51d2a1b694ba7fca00411d4e65e;p=mirror%2Fdsa-puppet.git
diff --git a/modules/salsa/templates/apache-pages.debian.net.conf.erb b/modules/salsa/templates/apache-pages.debian.net.conf.erb
index e925623f7..0f849ed0a 100644
--- a/modules/salsa/templates/apache-pages.debian.net.conf.erb
+++ b/modules/salsa/templates/apache-pages.debian.net.conf.erb
@@ -1,14 +1,23 @@
-#Use common-debian-service-https-redirect * XX.debian.org
+
+ ServerName pages.debian.net
+ ServerAlias *.pages.debian.net
+ ServerAdmin debian-admin@lists.debian.org
+
+ CustomLog /var/log/apache2/pages.debian.net-access.log privacy
+ ErrorLog /var/log/apache2/pages.debian.net-error.log
+
+ RewriteEngine On
+ RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
+
-#
-
+
ServerName pages.debian.net
ServerAlias *.pages.debian.net
ServerAdmin debian-admin@lists.debian.org
- #Use common-debian-service-ssl salsa.debian.org
- #Use common-ssl-HSTS
- #Use http-pkp-salsa.debian.org
+ Use common-debian-service-ssl pages.debian.net
+ Use common-ssl-HSTS
+ Use http-pkp-pages.debian.net
ErrorLog /var/log/apache2/pages.debian.net-error.log
CustomLog /var/log/apache2/pages.debian.net-access.log privacy
@@ -21,19 +30,19 @@
ProxyPreserveHost On
AllowEncodedSlashes NoDecode
- ProxyPassReverse / http://127.0.0.1:8090/
- #ProxyPassReverse / http://salsa.debian.org/
+ ProxyPass / http://127.0.0.1:9080/ retry=10 nocanon
+ ProxyPassReverse / http://127.0.0.1:9080/
- RewriteEngine on
+ #RewriteEngine on
#RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f [OR]
#RewriteCond %{REQUEST_URI} ^/uploads/.*
- RewriteRule .* http://127.0.0.1:8090%{REQUEST_URI} [P,QSA,NE]
+ #RewriteRule .* http://127.0.0.1:9080%{REQUEST_URI} [P,QSA,NE]
#RequestHeader set X_FORWARDED_PROTO 'https'
#RequestHeader set X-Forwarded-Ssl on
- ErrorDocument 403 /403.html
- ErrorDocument 404 /404.html
+ #ErrorDocument 403 /403.html
+ #ErrorDocument 404 /404.html
#ErrorDocument 422 /422.html
#ErrorDocument 500 /500.html
#ErrorDocument 502 /502.html