Drop apt.buildd.debian.org

[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 f9dd941..2107a36 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -99,6 +99,7 @@
                        ForceType text/html
                        AddDefaultCharset utf-8
                </Files>
+               AddType text/plain .wml
        </Directory>
 </Macro>
 
@@ -194,6 +195,32 @@
        RewriteRule ^/load.php$ /load-jquery.checkbox.js [L,QSD]
 </Macro>
 
+<Macro vstatic-vhost-extra-www.debconf.org>
+       ServerAlias www-test.debconf.org
+
+       <Directory /srv/static.debian.org/mirrors/www.debconf.org/cur>
+               Options +IncludesNOEXEC
+               SSILegacyExprParser on
+               DirectoryIndex index.shtml
+       </Directory>
+
+       AddOutputFilter INCLUDES .shtml
+
+       RewriteEngine On
+       # A few redirects for older debconf sites, so old links work
+       RewriteRule ^/gallery/(.*)$ https://gallery.debconf.org/v/$1 [R=permanent,L]
+       RewriteRule ^/.*years$ https://10years.debconf.org/ [R=permanent,L]
+       RewriteRule ^/debconf2$ https://debconf2.debconf.org/ [R=permanent,L]
+       RewriteRule ^/debconf3$ https://debconf3.debconf.org/ [R=permanent,L]
+       RewriteRule ^/debconf4$ https://debconf4.debconf.org/ [R=permanent,L]
+       RewriteRule ^/debconf5$ https://debconf5.debconf.org/ [R=permanent,L]
+       RewriteRule ^/10years/(.*)$ https://10years.debconf.org/$1 [R=permanent,L]
+       RewriteRule ^/debconf2/(.*)$ https://debconf2.debconf.org/$1 [R=permanent,L]
+       RewriteRule ^/debconf3/(.*)$ https://debconf3.debconf.org/$1 [R=permanent,L]
+       RewriteRule ^/debconf4/(.*)$ https://debconf4.debconf.org/$1 [R=permanent,L]
+       RewriteRule ^/debconf5/(.*)$ https://debconf5.debconf.org/$1 [R=permanent,L]
+</Macro>
+
 <%=
 
 def vhost(lines, sn, kwargs={})
@@ -241,7 +268,6 @@ 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, "dpl.debian.org"                , :ssl => true)
 vhost(lines, "dsa.debian.org"                , :ssl => true)
 vhost(lines, "rtc.debian.org"                , :ssl => true)
@@ -271,6 +297,7 @@ vhost(lines, "es.debconf.org"                , :ssl => true)
 vhost(lines, "fr.debconf.org"                , :ssl => true)
 vhost(lines, "miniconf10.debconf.org"        , :ssl => true)
 vhost(lines, "wiki.debconf.org"              , :ssl => true, :extra => true)
+vhost(lines, "www.debconf.org"               , :ssl => true, :extra => true)
 
 vhost(lines, "deb.debian.org"                , :extra => true)
 vhost(lines, "release.debian.org"            , :ssl => true, :extra => true)
@@ -379,6 +406,15 @@ Use common-dsa-vhost-https-redirect video.debconf.org
 </VirtualHost>
 <% end -%>
 
+Use common-dsa-vhost-https-redirect debconf.org
+<VirtualHost <%= @vhost_listen_443 %> >
+       ServerName debconf.org
+       ServerAdmin debian-admin@debian.org
+       Use common-debian-service-ssl debconf.org
+       Use common-ssl-HSTS
+       Redirect / https://www.debconf.org/
+</VirtualHost>
+
 # historical sites
 ##################
 # now only redirects remain