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=c2f13d4cf63d9d2143ebe02109eb5f157e4eea73;hp=4ecbf4e2cfb2ab4f34eca0e7ce8ae4e7ce6ebc4c;hpb=45d43dd7cd4a3866a0234f0180f638fbb02d1b82;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 4ecbf4e2c..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
@@ -301,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