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 48b1d80..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
@@ -5,6 +5,7 @@
 <% 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/
@@ -198,6 +199,7 @@ 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)
 
@@ -314,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: