X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-www.debian.org.erb;h=39f6cee0e9bfb669b0f260c4cdf8167bf105e8fb;hb=f6dc09c573b7a8fe5c9a0f07cfb7ac49d827f67e;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..39f6cee0e 100644
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -4,16 +4,13 @@
 ##
 
 # Need to turn on negotiation_module
-<Directory <%= wwwdo_document_root %>/>
+<Directory <%= @wwwdo_document_root %>/>
   Options +MultiViews +FollowSymLinks +Indexes
   AddHandler type-map var
   # 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 @@
   </Files>
 </Directory>
 
-<VirtualHost <%= vhost_listen %> >
+<Macro common-www-other.d.o>
    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
 
@@ -141,23 +141,21 @@
    ServerAlias www.debian.de
    ServerAlias newwww.deb.at
 
-   DocumentRoot <%= wwwdo_document_root %>/
+   DocumentRoot <%= @wwwdo_document_root %>/
+   LogFormat "0.0.0.0 - %u %{[%d/%b/%Y:00:00:00 %z]}t \"%r\" %>s %b \"%{Referer}i\" \"-\" %V" privacy+host
    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]
-</VirtualHost>
-
-
+   CustomLog /var/log/apache2/www-other.debian.org-access.log privacy+host
+</Macro>
 
 <Macro common-www.d.o>
    ServerName www.debian.org
    ServerAdmin webmaster@debian.org
    ServerAlias www-*.debian.org
-   DocumentRoot <%= wwwdo_document_root %>/
+   <% 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
    # document that was negotiated on the basis of content. This asks proxy
@@ -225,6 +223,8 @@
    RedirectPermanent /ports/ppc64   /ports/powerpc
    RedirectPermanent /ports/ppc64el   /ports/powerpc
    RedirectPermanent /ports/powerpcspe   /ports/powerpc
+   RedirectPermanent /mirror/official_sponsors /mirror/sponsors
+   RedirectPermanent /mirror/official /mirror/list
    RedirectPermanent /mirror/mirrors_full.html /mirror/list-full.html
    RedirectPermanent /mirrors /mirror
    RedirectPermanent /News/project /News/weekly
@@ -253,12 +253,12 @@
    RewriteRule ^/devel/debian-volatile/.* /volatile/ [R=301]
 
 # Offer a Redirect to DSA without knowing year #474730
-   RewriteMap dsa txt:<%= wwwdo_document_root %>/security/map-dsa.txt
+   RewriteMap dsa txt:<%= @wwwdo_document_root %>/security/map-dsa.txt
    RewriteRule ^/security/dsa-(\d+)(\..*)? /security/${dsa:$1}$2 [R=301]
 
 # Compatibility after SGML -> DocBook
 # Debian Reference #624239
-   RewriteMap reference txt:<%= wwwdo_document_root %>/doc/map-reference.txt
+   RewriteMap reference txt:<%= @wwwdo_document_root %>/doc/map-reference.txt
    RewriteCond %{DOCUMENT_ROOT}/doc/manuals/debian-reference/ch-support$1 !-f
    RewriteRule ^/doc/manuals/debian-reference/ch-support(.*)  /support$1 [L,R=301]
    RewriteCond %{DOCUMENT_ROOT}/doc/manuals/debian-reference/${reference:$1}$2 -f
@@ -284,13 +284,13 @@
 </Macro>
 
 
-<VirtualHost <%= vhost_listen %> >
+<VirtualHost <%= @vhost_listen %> >
    ErrorLog /var/log/apache2/www.debian.org-error.log
    CustomLog /var/log/apache2/www.debian.org-access.log privacy
 
    Use common-www.d.o
 </VirtualHost>
-<VirtualHost <%= vhost_listen_443 %> >
+<VirtualHost <%= @vhost_listen_443 %> >
    ErrorLog /var/log/apache2/www.debian.org-error.log
    CustomLog /var/log/apache2/www.debian.org-access.log privacyssl
 
@@ -301,16 +301,23 @@
 </VirtualHost>
 
 
-<VirtualHost <%= vhost_listen_443 %> >
-   ServerName debian.org
-   ServerAdmin webmaster@debian.org
+<VirtualHost <%= @vhost_listen %> >
+   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/
+</VirtualHost>
+<VirtualHost <%= @vhost_listen_443 %> >
+   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-debian-service-ssl debian.org
    Use common-ssl-HSTS
 </VirtualHost>
+# vim:set syn=apache: