X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-www.debian.org.erb;h=e09b2a6960a72324ac75150ede8a93b3d797b4f0;hb=1cfca29b9a90f243712995cbc7f406adc7735fba;hp=ff7ca6137b0ab9bed2cdc1b245a15e2a274d2751;hpb=dc1cd8cf2921db494b3b38350fe42aaf4c130628;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 ff7ca6137..e09b2a696 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
@@ -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]
@@ -148,8 +155,6 @@
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
@@ -208,6 +213,7 @@
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
@@ -226,6 +232,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]
@@ -266,9 +274,15 @@
>
+ ErrorLog /var/log/apache2/www.debian.org-error.log
+ CustomLog /var/log/apache2/www.debian.org-access.log privacy
+
Use common-www.d.o
>
+ 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
@@ -280,11 +294,12 @@
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/
+
Use common-debian-service-ssl www.debian.org
Use common-ssl-HSTS