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=4ecbf4e2cfb2ab4f34eca0e7ce8ae4e7ce6ebc4c;hpb=45d43dd7cd4a3866a0234f0180f638fbb02d1b82;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 4ecbf4e2c..3442b9fce 100644
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -90,7 +90,7 @@
   </Files>
 </Directory>
 
-<VirtualHost <%= vhost_listen %> >
+<Macro common-www-other.d.o>
    ServerName debian.org
    ServerAdmin webmaster@debian.org
 
@@ -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,14 +147,7 @@
    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
-   RewriteRule ^/(.*)$ http://www.debian.org/$1 [R=301,L]
-</VirtualHost>
-
-
+</Macro>
 
 <Macro common-www.d.o>
    ServerName www.debian.org
@@ -301,16 +297,22 @@
 </VirtualHost>
 
 
+<VirtualHost <%= vhost_listen %> >
+   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/
+</VirtualHost>
 <VirtualHost <%= vhost_listen_443 %> >
-   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
 </VirtualHost>