X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-www.debian.org.erb;h=157064b0d090da61c93998803c69fd58d3331eef;hb=b8a50b04a53f45a1cbf896a91b74c32e89038da3;hp=1578c8948cae03c937c76eeff9eee92b3551571b;hpb=678de195cb79b1a2297553fc17cbe042823e9044;p=dsa-puppet.git

diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb
index 1578c894..157064b0 100644
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -10,6 +10,10 @@
   # Make sure that the srm.conf directive is commented out.
   AddDefaultCharSet Off
   AllowOverride AuthConfig FileInfo
+  <% if @lsbmajdistrelease > '7' -%>
+    Require all granted
+  <% end -%>
+
 
   # Serve icons as image/x-icon
   AddType image/x-icon .ico
@@ -87,26 +91,70 @@
 </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 debian.us www.debian.us
+
+   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.org.tw
+   ServerAlias debian.org.tw
+
+   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
-   RewriteLog /var/log/apache2/www-other.debian.org-redirect.log
-   RewriteLogLevel 1
+   #RewriteLog /var/log/apache2/www-other.debian.org-redirect.log
+   #RewriteLogLevel 1
 
    RewriteEngine on
    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
@@ -165,11 +213,15 @@
    RedirectPermanent /intl /international
    RedirectPermanent /ports/armel  /ports/arm
    RedirectPermanent /ports/armhf  /ports/arm
+   RedirectPermanent /ports/arm64  /ports/arm
    RedirectPermanent /ports/mipsel /ports/mips
    RedirectPermanent /ports/kfreebsd-amd64 /ports/kfreebsd-gnu
    RedirectPermanent /ports/kfreebsd-i386  /ports/kfreebsd-gnu
    RedirectPermanent /ports/sparc64 /ports/sparc
    RedirectPermanent /ports/s390x   /ports/s390
+   RedirectPermanent /ports/ppc64   /ports/powerpc
+   RedirectPermanent /ports/ppc64el   /ports/powerpc
+   RedirectPermanent /ports/powerpcspe   /ports/powerpc
    RedirectPermanent /mirror/mirrors_full.html /mirror/list-full.html
    RedirectPermanent /mirrors /mirror
    RedirectPermanent /News/project /News/weekly
@@ -183,6 +235,8 @@
    RedirectPermanent /releases/6.0 /releases/squeeze
    RedirectPermanent /releases/7 /releases/wheezy
    RedirectPermanent /releases/8 /releases/jessie
+   RedirectPermanent /releases/9 /releases/stretch
+   RedirectPermanent /releases/10 /releases/buster
    RedirectPermanent /releases/unstable /releases/sid
 
    RewriteRule ^/ports/freebsd(.*) /ports/kfreebsd-gnu/ [R=301]
@@ -220,14 +274,38 @@
    RewriteCond %{DOCUMENT_ROOT}/doc/manuals/$1 -d
    RewriteRule ^/doc/([^/]+)/?(.*)? /doc/manuals/$1/$2 [L,R=301]
 
-</VirtualHost>
+# Relocation of blends pages
+   RewriteRule ^/devel/hamradio(.*)$ /blends/hamradio$1 [R=301,L]
+</Macro>
 
 
 <VirtualHost <%= vhost_listen %> >
-   ServerName volatile.debian.org
-   ServerAlias volatile-master.debian.org
+   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
+
+   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 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>