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=bec629e9a4027ecd47a92aa70e768c7b569dc97e;hp=aab039fb63ebd04dee64ea6bc7402001b13c313c;hpb=3e6332e65957ebcea62705d42f634a6a26d1deea;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 aab039fb6..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,19 +30,19 @@ Use common-debian-service-https-redirect * pages.debian.net
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