Always remove acpi packages from jessie hosts

[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 cc462ba14f7a1f01fd85fdc0c08fe36132a398c5..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
@@ -18,12 +18,13 @@ 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 -%>
 
+               # 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