X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Ftemplates%2Fapache-www.debian.org.erb;h=2988fbe32311b37812b059cd20e0e448ec5e9d66;hb=1f1aa0ea7fee69c0fa68cd1150e5ccbbe25f1ead;hp=b83d602c28c54088d7ba8cd5fc5044bb93f4035b;hpb=fc4035cfe3bac8a3543f4272afc6cb5c85c2c9c2;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 b83d602c2..2988fbe32 100644
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -10,10 +10,7 @@
# Make sure that the srm.conf directive is commented out.
AddDefaultCharSet Off
AllowOverride AuthConfig FileInfo
- <% if @lsbmajdistrelease > '7' -%>
- Require all granted
- <% end -%>
-
+ Require all granted
# Serve icons as image/x-icon
AddType image/x-icon .ico
@@ -90,7 +87,7 @@
- >
+
ServerName debian.org
ServerAdmin webmaster@debian.org
@@ -122,6 +119,9 @@
ServerAlias www.debian.fi
ServerAlias debian.fi
+ ServerAlias www.debian.nl
+ ServerAlias debian.nl
+
ServerAlias www.debian.com
ServerAlias debian.com
@@ -144,19 +144,16 @@
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
-
- RewriteEngine on
- RewriteRule ^/(.*)$ http://www.debian.org/$1 [R=301,L]
-
-
-
+
ServerName www.debian.org
ServerAdmin webmaster@debian.org
ServerAlias www-*.debian.org
+ <% if scope.function_onion_global_service_hostname(['www.debian.org']) -%>
+ ServerAlias <%= scope.function_onion_global_service_hostname(['www.debian.org']) %>
+ <% end %>
+
DocumentRoot <%= wwwdo_document_root %>/
# CacheNegotiatedDocs: By default, Apache sends Pragma: no-cache with each
@@ -171,11 +168,11 @@
RewriteRule ^/(?!devel/website/errors/)(.*/)?404\.(.+)\.html$ /devel/website/errors/404.$2.html [L]
# the joys of backwards compatibility
- RedirectPermanent /cgi-bin/cvsweb http://cvs.debian.org
- RedirectPermanent /Lists-Archives http://lists.debian.org
- RedirectPermanent /search http://search.debian.org
- RedirectPermanent /Packages http://packages.debian.org
- RedirectPermanent /lintian http://lintian.debian.org
+ RedirectPermanent /cgi-bin/cvsweb https://cvs.debian.org
+ RedirectPermanent /Lists-Archives https://lists.debian.org
+ RedirectPermanent /search https://search.debian.org
+ RedirectPermanent /Packages https://packages.debian.org
+ RedirectPermanent /lintian https://lintian.debian.org
RedirectPermanent /SPI http://www.spi-inc.org
# RedirectPermanent /OpenHardware http://www.openhardware.org
@@ -183,9 +180,9 @@
RedirectPermanent /Bugs/db/ix/pseudopackages.html /Bugs/pseudo-packages
RewriteEngine on
- RewriteRule ^/Bugs/db/pa/l([^/]+).html$ http://bugs.debian.org/$1
- 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
+ RewriteRule ^/Bugs/db/pa/l([^/]+).html$ https://bugs.debian.org/$1
+ RewriteRule ^/Bugs/db/[[:digit:]][[:digit:]]/([[:digit:]][[:digit:]][[:digit:]]+).html$ https://bugs.debian.org/$1
+ RewriteRule ^/Bugs/db/ma/l([^/]+).html$ https://bugs.debian.org/cgi-bin/pkgreport.cgi?maintenc=$1
UserDir disabled
@@ -199,7 +196,7 @@
RedirectPermanent /doc/packaging-manuals/packaging-tutorial /doc/manuals/packaging-tutorial
RedirectPermanent /doc/prospective-packages /devel/wnpp/
RedirectPermanent /devel/maintainer_contacts /intro/organization
- RedirectPermanent /devel/debian-installer/gtk-frontend http://wiki.debian.org/DebianInstaller/GUI
+ RedirectPermanent /devel/debian-installer/gtk-frontend https://wiki.debian.org/DebianInstaller/GUI
RedirectPermanent /zh/ /international/Chinese/
RedirectPermanent /chinese/ /international/Chinese/
RedirectPermanent /devel/help /devel/join/
@@ -277,6 +274,7 @@
# Canonical place for manuals under /doc/manuals/
RewriteCond %{DOCUMENT_ROOT}/doc/manuals/$1 -d
RewriteRule ^/doc/([^/]+)/?(.*)? /doc/manuals/$1/$2 [L,R=301]
+ RewriteRule ^/doc/manuals/?$ /doc/ [L,R=301]
# Relocation of blends pages
RewriteRule ^/devel/hamradio(.*)$ /blends/hamradio$1 [R=301,L]
@@ -300,16 +298,22 @@
+ >
+ Use common-www-other.d.o
+
+ ErrorLog /var/log/apache2/www-other.debian.org-error.log
+ CustomLog /var/log/apache2/www-other.debian.org-access.log privacy
+
+ Redirect permanent / http://www.debian.org/
+
>
- ServerName debian.org
- ServerAdmin webmaster@debian.org
+ Use common-www-other.d.o
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