appstream ssl

[dsa-puppet.git] / modules / roles / templates / static-mirroring / vhost / static-vhosts-simple.erb

diff --git a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
index 2e0ed8c1273884644641ccc5b5baeae2575bbd1f..5064c8f50475467275cee168eab8a0d72a47f4a4 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -2,12 +2,16 @@
 
 Use common-static-vhost mozilla.debian.net
 Use common-static-vhost backports.debian.org
+Use common-static-vhost incoming.debian.org
 Use common-static-vhost news.debian.net
+Use common-static-vhost debaday.debian.net
+Use common-static-vhost debdeltas.debian.net
 Use common-static-vhost-with-extra metadata.ftp-master.debian.org "AddDefaultCharset utf-8"
 Use common-static-vhost-with-extra d-i.debian.org "ServerAlias d-i-backend.debian.org"
 Use common-static-vhost-with-extra network-test.debian.org "ServerAlias network-test-backend.debian.org"
 Use common-static-vhost-with-extra blends.debian.org "ServerAlias blends-backend.debian.org"
 Use common-static-vhost-with-extra wnpp-by-tags.debian.net "ServerAlias wnpp-by-tags-backend.debian.org"
+Use common-static-vhost-ssl appstream.debian.org
 Use common-static-vhost-ssl dsa.debian.org
 Use common-static-vhost-ssl rtc.debian.org
 Use common-static-vhost-with-extra security-team.debian.org "ServerAlias security-team-backend.debian.org"
@@ -33,7 +37,7 @@ Use common-static-vhost-with-extra security-team.debian.org "ServerAlias securit
        RewriteEngine On
        RewriteCond %{REQUEST_URI} !^/feeds/
        RewriteRule ^/(.*)$ https://bits.debian.org/$1 [R,L]
-       #RewriteRule ^/(.*)$ https://bits.debian.org/$1 [NC,R=301,L]
+       #RewriteRule ^/(.*)$ https://bits.debian.org/$1 [R=301,L]
 
        Use static-bits.debian.org-base
        CustomLog /var/log/apache2/bits.debian.org-access.log privacy
@@ -44,7 +48,7 @@ Use common-static-vhost-with-extra security-team.debian.org "ServerAlias securit
        CustomLog /var/log/apache2/bits.debian.org-access.log privacyssl
 
        Use common-debian-service-ssl bits.debian.org
-       # Use common-ssl-HSTS
+       Use common-ssl-HSTS
 </VirtualHost>
 
 # www.backports.org
@@ -83,8 +87,12 @@ Use common-static-vhost-with-extra security-team.debian.org "ServerAlias securit
                AllowOverride FileInfo Indexes Options=Multiviews
                Options Multiviews Indexes FollowSymLinks Includes
                IndexOptions FancyIndexing NameWidth=*
-               Order allow,deny
-               Allow from all
+               <% if @lsbmajdistrelease > '7' -%>
+                       Require all granted
+               <% else -%>
+                       Order allow,deny
+                       Allow from all
+               <% end -%>
        </Directory>
 
        DefaultType text/plain