X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fsalsa%2Ftemplates%2Fapache-pages.debian.net.conf.erb;h=0f849ed0ad069c95cacde0c982ff41358c5a60c3;hb=66e44c6472622455d3e8b0b892cbce878b86630e;hp=b8690d5dbaef0f8a2fead28ed2172347c695e00b;hpb=98a22e0e0411de9ccdb6c17eb86cec98700115fd;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 b8690d5db..0f849ed0a 100644
--- a/modules/salsa/templates/apache-pages.debian.net.conf.erb
+++ b/modules/salsa/templates/apache-pages.debian.net.conf.erb
@@ -1,6 +1,16 @@
-Use common-debian-service-https-redirect * pages.debian.net
+
+ 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
@@ -20,13 +30,13 @@ Use common-debian-service-https-redirect * pages.debian.net
ProxyPreserveHost On
AllowEncodedSlashes NoDecode
- ProxyPass / http://127.0.0.1:8090/ retry=10 nocanon
- ProxyPassReverse / http://127.0.0.1:8090/
+ ProxyPass / http://127.0.0.1:9080/ retry=10 nocanon
+ ProxyPassReverse / http://127.0.0.1:9080/
#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