X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-www.debian.org.erb;h=933e2b65b9dbe5e487ded3ef8262befdfd403a22;hb=eacd512298c6132610479e70ab38213e5d63513d;hp=118ce80109008cd0d37a18fd91e4df3dfa4f70c6;hpb=49223ad1e8bf7a056e780783c3155d9099f88352;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 118ce801..933e2b65 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,73 @@ > - 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.fi + ServerAlias debian.fi + + 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] - > + + + 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 @@ -136,7 +187,9 @@ RewriteRule ^/Bugs/db/[[:digit:]][[:digit:]]/([[:digit:]][[:digit:]][[:digit:]]+).html$ http://bugs.debian.org/$1 RewriteRule ^/Bugs/db/ma/l([^/]+).html$ http://bugs.debian.org/cgi-bin/pkgreport.cgi?maintenc=$1 - Userdir http://people.debian.org/~*/ + + UserDir disabled + RedirectPermanent /devel/todo/ /devel/wnpp/help_requested_bypop RedirectPermanent /doc/FAQ /doc/manuals/debian-faq @@ -162,10 +215,16 @@ RedirectPermanent /misc/README.non-US /mirror/list.non-US 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 @@ -177,6 +236,10 @@ RedirectPermanent /releases/4.0 /releases/etch RedirectPermanent /releases/5.0 /releases/lenny 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] @@ -214,14 +277,38 @@ RewriteCond %{DOCUMENT_ROOT}/doc/manuals/$1 -d RewriteRule ^/doc/([^/]+)/?(.*)? /doc/manuals/$1/$2 [L,R=301] - +# Relocation of blends pages + RewriteRule ^/devel/hamradio(.*)$ /blends/hamradio$1 [R=301,L] + > - 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 + + > + 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 + + + + > + 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