new function call to find hiera objects

[mirror/dsa-puppet.git] / modules / roles / templates / apache-www.debian.org.erb

diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb
index 5c9d125..f505aae 100644 (file)
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -142,14 +142,19 @@
    ServerAlias newwww.deb.at
 
    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
+   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
+   <% 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
@@ -218,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
@@ -310,6 +317,6 @@
 
    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>