Always remove acpi packages from jessie hosts

[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 79531d2806cccc85a44d49b23f6c1304d2763198..2ee11c67cf82b491885088d7926bd1c22d0b6817 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,16 +2,34 @@
 
 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-with-extra metadata.ftp-master.debian.org "AddDefaultCharset utf-8"
+Use common-static-vhost debaday.debian.net
+Use common-static-vhost debdeltas.debian.net
+Use common-static-vhost timeline.debian.net
 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"
 
+# metadata.ftp-master.debian.org
+<VirtualHost <%= vhost_listen %> >
+       ServerName metadata.ftp-master.debian.org
+       ServerAdmin debian-admin@lists.debian.org
+
+       ErrorLog /var/log/apache2/metadata.ftp-master.debian.org-error.log
+       CustomLog /var/log/apache2/metadata.ftp-master.debian.org-access.log privacy
+
+       Use common-static-base metadata.ftp-master.debian.org
+       AddDefaultCharset utf-8
+       <LocationMatch "/changelogs/(main|contrib|non-free)">
+               ForceType text/plain
+       </LocationMatch>
+</VirtualHost>
 
 # bits.debian.org
 ######################
@@ -28,6 +46,13 @@ Use common-static-vhost-with-extra security-team.debian.org "ServerAlias securit
 </Macro>
 
 <Virtualhost <%= vhost_listen %> >
+       RewriteEngine on
+
+       RewriteEngine On
+       RewriteCond %{REQUEST_URI} !^/feeds/
+       RewriteRule ^/(.*)$ https://bits.debian.org/$1 [R,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
 </VirtualHost>
@@ -37,7 +62,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
@@ -76,11 +101,14 @@ 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
        AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
        AddOutputFilter INCLUDES .xhtml
 </VirtualHost>
@@ -102,6 +130,15 @@ Use common-static-vhost-with-extra security-team.debian.org "ServerAlias securit
        RedirectPermanent / http://www.ports.debian.org/
 </VirtualHost>
 
+# video.debian.net
+###################
+<VirtualHost <%= vhost_listen %> >
+       ServerName video.debian.net
+       ServerAdmin debian-admin@debian.org
+
+       Redirect / http://meetings-archive.debian.net/pub/debian-meetings/
+</VirtualHost>
+
 # historical sites
 ##################
 # now only redirects remain