ferm cleanup: bmdb1:dedup

[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 0af5e2a..40a4496 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -73,10 +73,6 @@
        </LocationMatch>
 </Macro>
 
-<Macro vstatic-vhost-extra-metadata-backend.ftp-master.debian.org>
-       Use vstatic-vhost-extra-metadata.ftp-master.debian.org>
-</Macro>
-
 <Macro vstatic-vhost-extra-release.debian.org>
        RewriteEngine   on
        RewriteRule             ^/migration/$                   /migration/testing.pl
@@ -218,7 +214,6 @@ vhost(lines, "cdbuilder-logs.debian.org"     , :ssl => true)
 vhost(lines, "bits.debian.org"               , :ssl => true, :extra => true)
 vhost(lines, "micronews.debian.org"          , :ssl => true)
 vhost(lines, "metadata.ftp-master.debian.org", :extra => true)
-vhost(lines, "metadata-backend.ftp-master.debian.org", :ssl => true, :ssl_optional => true, :extra => true)
 
 vhost(lines, "10years.debconf.org"           , :ssl => true)
 vhost(lines, "debconf0.debconf.org"          , :ssl => true)
@@ -232,6 +227,7 @@ vhost(lines, "debconf7.debconf.org"          , :ssl => true)
 vhost(lines, "debconf16.debconf.org"         , :ssl => true)
 vhost(lines, "debconf17.debconf.org"         , :ssl => true)
 vhost(lines, "debconf18.debconf.org"         , :ssl => true)
+vhost(lines, "debconf19.debconf.org"         , :ssl => true)
 vhost(lines, "es.debconf.org"                , :ssl => true)
 vhost(lines, "fr.debconf.org"                , :ssl => true)
 vhost(lines, "miniconf10.debconf.org"        , :ssl => true)
@@ -329,6 +325,20 @@ Use common-dsa-vhost-https-redirect video.debconf.org
        Redirect / https://debconf-video-team.pages.debian.net/docs/
 </VirtualHost>
 
+<% if scope.function_has_static_component(['metadata.ftp-master.debian.org']) -%>
+<VirtualHost <%= @vhost_listen_443 %> >
+       ServerName metadata.ftp-master.debian.org
+       ServerAlias metadata-backend.ftp-master.debian.org
+       # all self-referential URLs should use the public host name
+       UseCanonicalName On
+       Use common-debian-service-ssl metadata-backend.ftp-master.debian.org
+       ErrorLog /var/log/apache2/metadata-backend.ftp-master.debian.org-error.log
+       CustomLog /var/log/apache2/metadata-backend.ftp-master.debian.org-access.log privacy
+
+       Use static-vhost-base-metadata.ftp-master.debian.org
+</VirtualHost>
+<% end -%>
+
 # historical sites
 ##################
 # now only redirects remain
@@ -397,5 +407,50 @@ Use common-dsa-vhost-https-redirect archive.debian.net
        Use common-disabled-service
 </VirtualHost>
 
+<VirtualHost <%= @vhost_listen %> >
+       ServerName cdimage.debian.org
+       ServerAlias cloud.debian.org
+       ServerAlias get.debian.org
+       ServerAlias bttracker.debian.org
+       ServerAlias meetings-archive.debian.net
+       ServerAdmin debian-admin@debian.org
+       ErrorLog /var/log/apache2/cdimage.debian.org-error.log
+       CustomLog /var/log/apache2/cdimage.debian.org-access.log privacyssl
+
+       <IfModule mod_userdir.c>
+               UserDir disabled
+       </IfModule>
+       DocumentRoot /srv/static.debian.org/puppet/cdimage.debian.org
+       <Directory /srv/static.debian.org/puppet/cdimage.debian.org>
+               Require all granted
+       </Directory>
+       RewriteEngine On
+       RewriteRule !^/503.html / [R=503]
+       ErrorDocument 503 /503.html
+</VirtualHost>
+
+<VirtualHost <%= @vhost_listen_443 %> >
+       ServerName cdimage.debian.org
+       ServerAlias cloud.debian.org
+       ServerAlias get.debian.org
+       ServerAlias bttracker.debian.org
+       ServerAlias meetings-archive.debian.net
+       ServerAdmin debian-admin@debian.org
+       ErrorLog /var/log/apache2/cdimage.debian.org-error.log
+       CustomLog /var/log/apache2/cdimage.debian.org-access.log privacyssl
+       Use common-debian-service-ssl cdimage.debian.org
+
+       <IfModule mod_userdir.c>
+               UserDir disabled
+       </IfModule>
+       DocumentRoot /srv/static.debian.org/puppet/cdimage.debian.org
+       <Directory /srv/static.debian.org/puppet/cdimage.debian.org>
+               Require all granted
+       </Directory>
+       RewriteEngine On
+       RewriteRule !^/503.html / [R=503]
+       ErrorDocument 503 /503.html
+</VirtualHost>
+
 
 # vim:ft=apache: