Handle apache 2.4 authz_host config in www.debian.org template

[dsa-puppet.git] / modules / roles / templates / apache-www.debian.org.erb

diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb
index 7a2863b5a98411d289423da87f6ae5148c8b1eef..8c39f2905f8cad25743f6b60b59473d2e14ed2e7 100644 (file)
--- 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
@@ -127,6 +131,9 @@
    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
@@ -134,8 +141,8 @@
    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]
@@ -224,6 +231,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]
@@ -284,7 +293,7 @@
    ServerName debian.org
    ServerAdmin webmaster@debian.org
 
-   CustomLog /var/log/apache2/www-other-access.log privacy
+   CustomLog /var/log/apache2/www-other-access.log privacyssl
    ErrorLog /var/log/apache2/www-other-error.log
 
    Redirect permanent / https://www.debian.org/