X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-www.debian.org.erb;h=7a2863b5a98411d289423da87f6ae5148c8b1eef;hb=e61fd58dc36fa5a465f75d21b399034ef4869053;hp=db88d9c02076b3df6f8f7874972591bcb257cf76;hpb=d0fa9d754b8616aa3179c9c80f23896db55085a8;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 db88d9c02..7a2863b5a 100644
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -87,9 +87,50 @@
 </Directory>
 
 <VirtualHost <%= vhost_listen %> >
-   ServerName www.nl.debian.org
+   ServerName debian.org
    ServerAdmin webmaster@debian.org
-   ServerAlias www.debian.com www.debian.de www.*.debian.org newwww.deb.at www.debian.net debian.net debian.org www.debian.at www.debian.eu debian.eu debian.com
+
+   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
+
+   ServerAlias www.debian.eu
+   ServerAlias debian.eu
+
+   ServerAlias www.debian.com
+   ServerAlias debian.com
+
+   ServerAlias debian.us
+   ServerAlias www.debian.us
+
+   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
+
    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
@@ -100,13 +141,13 @@
    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
    DocumentRoot <%= wwwdo_document_root %>/
-   ErrorLog /var/log/apache2/www.debian.org-error.log
-   CustomLog /var/log/apache2/www.debian.org-access.log privacy
 
    # CacheNegotiatedDocs: By default, Apache sends Pragma: no-cache with each
    # document that was negotiated on the basis of content. This asks proxy
@@ -219,15 +260,36 @@
 # 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 %> >
+   ErrorLog /var/log/apache2/www.debian.org-error.log
+   CustomLog /var/log/apache2/www.debian.org-access.log privacy
+
+   Use common-www.d.o
 </VirtualHost>
+<VirtualHost <%= vhost_listen_443 %> >
+   ErrorLog /var/log/apache2/www.debian.org-error.log
+   CustomLog /var/log/apache2/www.debian.org-access.log privacyssl
 
+   Use common-www.d.o
 
-<VirtualHost <%= vhost_listen %> >
-   ServerName volatile.debian.org
-   ServerAlias volatile-master.debian.org
+   Use common-debian-service-ssl www.debian.org
+   Use common-ssl-HSTS
+</VirtualHost>
+
+
+<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>