X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=7ae70fb878b25f72960512df24fe7c73fb02a224;hb=2750ccc51b2913146b9284aaec444f4ced4b65ec;hp=fe78e49bba632573f2c4b91cd1650da5e5fdf492;hpb=8a6f86ad8e7da1d84ef781cc4415ede0247fe7ec;p=mirror%2Fdsa-puppet.git

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 fe78e49bb..7ae70fb87 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -155,6 +155,55 @@
 	</FilesMatch>
 </Macro>
 
+<Macro vstatic-vhost-extra-wiki.debconf.org>
+	<Location /wiki/>
+		ForceType text/html
+	</Location>
+	<Location /action/>
+		ForceType text/html
+	</Location>
+
+	RewriteEngine on
+	RewriteRule ^/$ /wiki/Main_Page [L,R=permanent]
+	RewriteRule ^/wiki/$ /wiki/Main_Page [L,R=permanent]
+
+	RewriteCond %{QUERY_STRING} (^|&)modules=mediawiki.legacy.commonPrint,shared|skins.monobook(&|$)
+	RewriteCond %{QUERY_STRING} (^|&)only=styles(&|$)
+	RewriteRule ^/load.php$ /load-monobook-styles.css [L,QSD]
+
+	RewriteCond %{QUERY_STRING} (^|&)modules=site(&|$)
+	RewriteCond %{QUERY_STRING} (^|&)only=styles(&|$)
+	RewriteRule ^/load.php$ /load-site-styles.css [L,QSD]
+
+	RewriteCond %{QUERY_STRING} (^|&)modules=startup(&|$)
+	RewriteCond %{QUERY_STRING} (^|&)only=scripts(&|$)
+	RewriteRule ^/load.php$ /load-startup-scripts.js [L,QSD]
+
+	RewriteCond %{QUERY_STRING} (^|&)modules=site(&|$)
+	RewriteCond %{QUERY_STRING} (^|&)only=scripts(&|$)
+	RewriteRule ^/load.php$ /load-site-scripts.js [L,QSD]
+
+	RewriteCond %{QUERY_STRING} (^|&)modules=jquery%2Cmediawiki(&|$)
+	RewriteCond %{QUERY_STRING} (^|&)only=scripts(&|$)
+	RewriteRule ^/load.php$ /load-jquery-scripts.js [L,QSD]
+
+	RewriteCond %{QUERY_STRING} (^|&)modules=jquery.client%2Ccookie%2CmessageBox%2CmwExtension|mediawiki.legacy.ajax%2Cwikibits|mediawiki.page.startup|mediawiki.util(&|$)
+	RewriteRule ^/load.php$ /load-jquery.client.js [L,QSD]
+
+	RewriteCond %{QUERY_STRING} (^|&)modules=jquery.checkboxShiftClick%2CmakeCollapsible%2Cmw-jump%2Cplaceholder%7Cmediawiki.page.ready%7Cmediawiki.user(&|$)
+	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 +Includes
+	</Directory>
+
+	AddOutputFilter INCLUDES .shtml
+</Macro>
+
 <%=
 
 def vhost(lines, sn, kwargs={})
@@ -227,9 +276,11 @@ 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)
+vhost(lines, "wiki.debconf.org"              , :ssl => true, :extra => true)
 
 vhost(lines, "deb.debian.org"                , :extra => true)
 vhost(lines, "release.debian.org"            , :ssl => true, :extra => true)
@@ -324,6 +375,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
@@ -392,5 +457,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: