X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=inline;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=6165aa8f6d0ff8b62e12bc84815502cd95077c4f;hb=d30f0d07d1a24af0e7655712f69c501a5f40f284;hp=bf21e19b519a9821e9ab139c5b60fe5f5445b23a;hpb=a84e38aa8541e317fdb16ea73f612dbcce9c3d82;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 bf21e19b5..6165aa8f6 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -4,12 +4,12 @@ Use common-static-vhost mozilla.debian.net
Use common-static-vhost backports.debian.org
Use common-static-vhost-publiclog bits.debian.org
Use common-static-vhost news.debian.net
+Use common-static-vhost dsa.debian.org
Use common-static-vhost-with-extra ftp-master.metadata.debian.org "AddDefaultCharset utf-8"
Use common-static-vhost-with-extra d-i.debian.org "ServerAlias d-i-backend.debian.org"
Use common-static-vhost-with-extra network-test.debian.org "ServerAlias network-test-backend.debian.org"
Use common-static-vhost-with-extra blends.debian.org "ServerAlias blends-backend.debian.org"
Use common-static-vhost-with-extra wnpp-by-tags.debian.net "ServerAlias wnpp-by-tags-backend.debian.org"
-Use common-static-vhost-with-extra www.ports.debian.org "ServerAlias www.ports-backend.debian.org"
# www.backports.org is the historical place for the backports
# website and archive. It is now a CNAME to backports.debian.org:
@@ -41,7 +41,35 @@ Use common-static-vhost-with-extra www.ports.debian.org "ServerAlias www.ports-b
RedirectPermanent /press/ http://wiki.debian.org/DebianWomen/Press
RedirectPermanent /profiles/ http://www.debian.org/women/profiles/
-# vim:ft=apache:
+
+# debian ports stuff
+####################
+ >
+ ServerName www.ports.debian.org
+ ServerAlias www.ports-backend.debian.org
+ ServerAdmin debian-admin@lists.debian.org
+
+ ErrorLog /var/log/apache2/www.ports.debian.org-error.log
+ CustomLog /var/log/apache2/www.ports.debian.org-access.log privacy
+
+
+ UserDir disabled
+
+ ServerSignature On
+
+ DocumentRoot /srv/static.debian.org/mirrors/www.ports.debian.org/cur
+
+ AllowOverride FileInfo Indexes Options=Multiviews
+ Options Multiviews Indexes FollowSymLinks Includes
+ IndexOptions FancyIndexing NameWidth=*
+ Order allow,deny
+ Allow from all
+
+
+ DefaultType text/plain
+ AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
+ AddOutputFilter INCLUDES .xhtml
+
>
ServerName www.debian-ports.org
@@ -53,3 +81,11 @@ Use common-static-vhost-with-extra www.ports.debian.org "ServerAlias www.ports-b
RedirectPermanent /debian/ http://archive.ports.debian.org/debian/
RedirectPermanent / http://www.ports.debian.org/
+
+ >
+ ServerName ports.debian.net
+ ServerAdmin debian-admin@debian.org
+ RedirectPermanent / http://www.ports.debian.org/
+
+
+# vim:ft=apache: