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=eedd9b7a5e400500547a9e40bb9bd2e415dfb701;hp=09a5593a7841243ee8071ac2029755411b4a6d78;hpb=4ddddaa2fa2acaf25a8d128f5abff5bd79a01f7d;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 09a5593a7..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
+<VirtualHost 209.87.16.45:80 [2607:f8f0:614:1::1274:45]:80>
+	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]
+</VirtualHost>
 
-<VirtualHost *:443>
+<VirtualHost 209.87.16.45:443 [2607:f8f0:614:1::1274:45]:443>
 	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:8080/ 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