mirror_debug -> debug_mirror

[mirror/dsa-puppet.git] / modules / roles / templates / static-mirroring / vhost / lintian.debian.org.erb

diff --git a/modules/roles/templates/static-mirroring/vhost/lintian.debian.org.erb b/modules/roles/templates/static-mirroring/vhost/lintian.debian.org.erb
index 2d112f2..89a74d0 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/lintian.debian.org.erb
+++ b/modules/roles/templates/static-mirroring/vhost/lintian.debian.org.erb
@@ -1,9 +1,12 @@
-<Virtualhost <%= vhost_listen %> >
-       ServerName lintian.debian.org
+<% if scope.function_has_static_component(['lintian.debian.org']) -%>
+
+Use common-dsa-vhost-https-redirect lintian.debian.org
+
+<Macro vhost-inner-lintian.debian.org>
        ServerAdmin lintian-maint@debian.org
 
        ErrorLog /var/log/apache2/lintian.debian.org-error.log
-       CustomLog /var/log/apache2/lintian.debian.org-access.log privacy
+       CustomLog /var/log/apache2/lintian.debian.org-access.log privacyssl
 
        <IfModule mod_userdir.c>
                UserDir disabled
@@ -13,7 +16,10 @@
        AddDefaultCharset utf-8
 
        <Directory /srv/static.debian.org/mirrors/lintian.debian.org/cur>
-               # These two lines makes apache serve "lintian.log.gz" as a text/plain with encoding gzip
+               Require all granted
+
+               # These three lines makes apache serve
+               # "lintian.log.gz" as a text/plain with encoding gzip
                # making it easier to view the log in the browser.
                RemoveType .gz
                AddEncoding x-gzip .gz
@@ -25,12 +31,6 @@
                </IfModule>
        </Directory>
 
-       <Directory /srv/static.debian.org/mirrors/lintian.debian.org/cur/graphs>
-               # Cache graphs for an hour (Technically, a "expires" of "24h after last mod"
-               # might be better, but oh well)
-               Header set Cache-Control "max-age=3600, must-revalidate, public"
-       </Directory>
-
        <Directory /srv/static.debian.org/mirrors/lintian.debian.org/cur/resources>
                # Cache these for a year (3600 * 24 * 365.25)
                # Files in here will change name if their content change
@@ -50,5 +50,22 @@
        RewriteRule ^/source/([a-z0-9-]+)/?$ /${source-map:$1} [L,R,NE]
        # Versioned request
        RewriteRule ^/source/([a-z0-9-]+)/([a-zA-Z0-9.+:~-]+)$ /${source-map:$1/$2} [L,R,NE]
+</Macro>
+
+<Virtualhost <%= vhost_listen_443 %> >
+       ServerName lintian.debian.org
+       Use common-debian-service-ssl lintian.debian.org
+       Use common-ssl-HSTS
+
+       Use vhost-inner-lintian.debian.org
 </VirtualHost>
+
+<% if scope.function_onion_global_service_hostname(['lintian.debian.org']) -%>
+<Virtualhost <%= vhost_listen %> >
+       ServerName <%= scope.function_onion_global_service_hostname(['lintian.debian.org']) %>
+       Use vhost-inner-lintian.debian.org
+</VirtualHost>
+<% end %>
+<% end -%>
+
 # vim:set syn=apache: