X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-www.debian.org.erb;h=ff7ca6137b0ab9bed2cdc1b245a15e2a274d2751;hb=6feeb15ef91124cbe110ef247a375e6e4c825aee;hp=92566cff712a69bf2ccd7be78f94aa976a3eb148;hpb=e573761fb20de1721ac4ec8d5e7e96d3293d7b6f;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 92566cff7..ff7ca6137 100644
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -90,7 +90,24 @@
    ServerName debian.org
    ServerAdmin webmaster@debian.org
 
-   ServerAlias www.*.debian.org
+   ServerAlias www.at.debian.org
+   ServerAlias www.au.debian.org
+   ServerAlias www.bg.debian.org
+   ServerAlias www.br.debian.org
+   ServerAlias www.cn.debian.org
+   ServerAlias www.de.debian.org
+   ServerAlias www.es.debian.org
+   ServerAlias www.fr.debian.org
+   ServerAlias www.hk.debian.org
+   ServerAlias www.id.debian.org
+   ServerAlias www.jp.debian.org
+   ServerAlias www.nl.debian.org
+   ServerAlias www.pl.debian.org
+   ServerAlias www.ru.debian.org
+   ServerAlias www.ua.debian.org
+   ServerAlias www.uk.debian.org
+   ServerAlias www.us.debian.org
+   ServerAlias www.za.debian.org
 
    ServerAlias www.debian.net
    ServerAlias debian.net
@@ -107,6 +124,9 @@
    ServerAlias debian.gr
    ServerAlias www.debian.gr
 
+   ServerAlias www.debian.es
+   ServerAlias debian.es
+
    ServerAlias www.debian.at
    ServerAlias www.debian.de
    ServerAlias newwww.deb.at
@@ -121,7 +141,9 @@
    RewriteRule ^/(.*)$ http://www.debian.org/$1 [R=301,L]
 </VirtualHost>
 
-<VirtualHost <%= vhost_listen %> >
+
+
+<Macro common-www.d.o>
    ServerName www.debian.org
    ServerAdmin webmaster@debian.org
    ServerAlias www-*.debian.org
@@ -240,15 +262,29 @@
 # Canonical place for manuals under /doc/manuals/
    RewriteCond %{DOCUMENT_ROOT}/doc/manuals/$1 -d
    RewriteRule ^/doc/([^/]+)/?(.*)? /doc/manuals/$1/$2 [L,R=301]
+</Macro>
 
+
+<VirtualHost <%= vhost_listen %> >
+   Use common-www.d.o
 </VirtualHost>
+<VirtualHost <%= vhost_listen_443 %> >
+   Use common-www.d.o
 
+   Use common-debian-service-ssl www.debian.org
+   Use common-ssl-HSTS
+</VirtualHost>
 
-<VirtualHost <%= vhost_listen %> >
-   ServerName volatile.debian.org
-   ServerAlias volatile-master.debian.org
+
+<VirtualHost <%= vhost_listen_443 %> >
+   ServerName debian.org
    ServerAdmin webmaster@debian.org
-   ErrorLog /var/log/apache2/volatile.debian.org-error.log
-   CustomLog /var/log/apache2/volatile.debian.org-access.log privacy
-   RedirectMatch permanent . http://www.debian.org/volatile/
+
+   CustomLog /var/log/apache2/www-other-access.log privacy
+   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>