All www and static mirrors run jessie

[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 cc462ba..4e45371 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,3 +1,5 @@
+<% if scope.function_has_static_component(['lintian.debian.org']) -%>
+
 Use common-dsa-vhost-https-redirect lintian.debian.org
 
 <Virtualhost <%= vhost_listen_443 %> >
@@ -18,12 +20,11 @@ Use common-dsa-vhost-https-redirect lintian.debian.org
        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
-               # making it easier to view the log in the browser.
-               <% if @lsbmajdistrelease > '7' -%>
-                       Require all granted
-               <% end -%>
+               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
                AddType text/plain .log
@@ -34,12 +35,6 @@ Use common-dsa-vhost-https-redirect lintian.debian.org
                </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
@@ -60,4 +55,6 @@ Use common-dsa-vhost-https-redirect lintian.debian.org
        # Versioned request
        RewriteRule ^/source/([a-z0-9-]+)/([a-zA-Z0-9.+:~-]+)$ /${source-map:$1/$2} [L,R,NE]
 </VirtualHost>
+<% end -%>
+
 # vim:set syn=apache: