Add timeline.debian.net to the static CDN

[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 2d112f239383314a647919f80f3f5d59bcfd7f34..c52b100a8f0e5e04cf0df3feca137c5167d9a4d4 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,14 @@
-<Virtualhost <%= vhost_listen %> >
+Use common-dsa-vhost-https-redirect lintian.debian.org
+
+<Virtualhost <%= vhost_listen_443 %> >
        ServerName 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
+
+       Use common-debian-service-ssl lintian.debian.org
+       Use common-ssl-HSTS
 
        <IfModule mod_userdir.c>
                UserDir disabled
@@ -13,7 +18,12 @@
        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
+               <% if @lsbmajdistrelease > '7' -%>
+                       Require all granted
+               <% end -%>
+
+               # 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 +35,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