]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
Fix static hosts on jessie
authorPeter Palfrader <peter@palfrader.org>
Fri, 1 May 2015 06:53:31 +0000 (08:53 +0200)
committerPeter Palfrader <peter@palfrader.org>
Fri, 1 May 2015 06:53:31 +0000 (08:53 +0200)
modules/roles/templates/static-mirroring/static-vhost.conf.erb

index b2650744f6c2bb5f8aa65fb3124f4c3ff07910ae..cfb35c0baada1de7265ac47e758fdfc24feb208e 100644 (file)
        <Directory /srv/static.debian.org/mirrors/$name/cur>
                AllowOverride FileInfo Indexes Options=Multiviews
                IndexOptions FancyIndexing NameWidth=*
-               Order allow,deny
-               Allow from all
+               <% if @lsbmajdistrelease > '7' -%>
+                       Require all granted
+               <% else -%>
+                       Order allow,deny
+                       Allow from all
+               <% end -%>
        </Directory>
 
        Header set Surrogate-Key <%= hostname %>