X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-www.debian.org.erb;h=3442b9fce1774deec2232493bb609ec3f2a3a5e4;hb=b1f236195b151cc975e54767b83e5fa8c54dd0f4;hp=aaebe84d6fb07416de95cf2b4e59846cd21e1c9c;hpb=4857bcfb3256229f339fd34d2d5c75cce2012f5e;p=mirror%2Fdsa-puppet.git
diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb
index aaebe84d6..3442b9fce 100644
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -122,6 +122,9 @@
ServerAlias www.debian.fi
ServerAlias debian.fi
+ ServerAlias www.debian.nl
+ ServerAlias debian.nl
+
ServerAlias www.debian.com
ServerAlias debian.com
@@ -144,10 +147,6 @@
DocumentRoot <%= wwwdo_document_root %>/
ErrorLog /var/log/apache2/www-other.debian.org-error.log
CustomLog /var/log/apache2/www-other.debian.org-access.log privacy
- #RewriteLog /var/log/apache2/www-other.debian.org-redirect.log
- #RewriteLogLevel 1
-
- RewriteEngine on
@@ -281,16 +280,6 @@
- >
- Use common-www-other.d.o
- RewriteRule ^/(.*)$ http://www.debian.org/$1 [R=301,L]
-
- >
- Use common-www-other.d.o
- RewriteRule ^/(.*)$ https://www.debian.org/$1 [R=301,L]
-
-
-
>
ErrorLog /var/log/apache2/www.debian.org-error.log
CustomLog /var/log/apache2/www.debian.org-access.log privacy
@@ -308,16 +297,22 @@
+ >
+ Use common-www-other.d.o
+
+ ErrorLog /var/log/apache2/www-other.debian.org-error.log
+ CustomLog /var/log/apache2/www-other.debian.org-access.log privacy
+
+ Redirect permanent / http://www.debian.org/
+
>
- ServerName debian.org
- ServerAdmin webmaster@debian.org
+ Use common-www-other.d.o
CustomLog /var/log/apache2/www-other-access.log privacyssl
ErrorLog /var/log/apache2/www-other-error.log
Redirect permanent / https://www.debian.org/
-
Use common-debian-service-ssl www.debian.org
Use common-ssl-HSTS