Make archvsync_base create the /etc/ssh/userkeys/archvsync symlink

[mirror/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 5900b1e..6599583 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -4,6 +4,10 @@
 # deb.debian.org
 <% if scope.function_has_static_component(['deb.debian.org']) -%>
 <Macro vstatic-vhost-extra-deb.debian.org>
+       ServerAlias httpredir.debian.org
+       ServerAlias cdn.debian.net
+       ServerAlias http.debian.net
+
        Redirect /debian/           http://cdn-fastly.deb.debian.org/debian/
        Redirect /debian-debug/     http://cdn-fastly.deb.debian.org/debian-debug/
        Redirect /debian-ports/     http://cdn-fastly.deb.debian.org/debian-ports/
@@ -29,7 +33,6 @@
        <Directory /srv/static.debian.org/mirrors/deb.debian.org/cur>
                AllowOverride FileInfo Indexes Options=Multiviews
                Options Indexes SymLinksIfOwnerMatch
-               IndexOptions FancyIndexing NameWidth=*
                Require all granted
        </Directory>
 
@@ -79,7 +82,6 @@
        <Directory /srv/static.debian.org/mirrors/release.debian.org-pu/cur>
                Require all granted
                Options Indexes SymLinksIfOwnerMatch MultiViews
-               IndexOptions FancyIndexing NameWidth=*
 
                AddEncoding gzip .gz
                FilterDeclare gzip CONTENT_SET
@@ -100,7 +102,6 @@
        <Directory /srv/static.debian.org/mirrors/www.ports.debian.org/cur>
                AllowOverride FileInfo Indexes Options=Multiviews
                Options Multiviews Indexes FollowSymLinks Includes
-               IndexOptions FancyIndexing NameWidth=*
                Require all granted
        </Directory>
 
@@ -195,9 +196,12 @@ vhost(lines, "wnpp-by-tags.debian.net"       , :ssl => true)
 vhost(lines, "security-team.debian.org"      , :ssl => true)
 vhost(lines, "d-i.debian.org"                , :ssl => true)
 vhost(lines, "appstream.debian.org"          , :ssl => true)
+vhost(lines, "apt.buildd.debian.org"         , :ssl => true)
 vhost(lines, "dsa.debian.org"                , :ssl => true)
 vhost(lines, "rtc.debian.org"                , :ssl => true)
+vhost(lines, "mirror-master.debian.org"      , :ssl => true)
 vhost(lines, "onion.debian.org"              , :ssl => true)
+vhost(lines, "manpages.debian.org"           , :ssl => true, :extra => true)
 
 vhost(lines, "bits.debian.org"               , :ssl => true, :extra => true)
 vhost(lines, "micronews.debian.org"          , :ssl => true)
@@ -312,4 +316,10 @@ lines.join("\n")
        RedirectPermanent / https://backports.debian.org/
 </VirtualHost>
 
+<VirtualHost <%= vhost_listen %> >
+       ServerName manpages.debian.net
+       ServerAdmin debian-admin@debian.org
+       Redirect / https://manpages.debian.org/
+</VirtualHost>
+
 # vim:ft=apache: