Add www.debconf.org vhost on static

[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 9438728..7ae70fb 100644 (file)
--- 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={})
@@ -231,6 +280,7 @@ 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)
@@ -407,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: