X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=97ed145a3b00a66fb9742435748c6bb77e91cbf7;hb=6a94b204599f27a5ec786e03242b594fb51bc7fc;hp=4cef975c348f2df65b34521ec47df31cf550d4aa;hpb=927f9ca9bed8928ea91ba1a599857c483ae4994e;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 4cef975c3..97ed145a3 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -1,5 +1,165 @@
# puppet maintained
Use common-static-vhost mozilla.debian.net
+Use common-static-vhost backports.debian.org
+Use common-static-vhost incoming.debian.org
+Use common-static-vhost news.debian.net
+Use common-static-vhost debaday.debian.net
+Use common-static-vhost debdeltas.debian.net
+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-ssl appstream.debian.org
+Use common-static-vhost-ssl dsa.debian.org
+Use common-static-vhost-ssl rtc.debian.org
+Use common-static-vhost-with-extra security-team.debian.org "ServerAlias security-team-backend.debian.org"
+
+# metadata.ftp-master.debian.org
+ >
+ ServerName metadata.ftp-master.debian.org
+ ServerAdmin debian-admin@lists.debian.org
+
+ ErrorLog /var/log/apache2/metadata.ftp-master.debian.org-error.log
+ CustomLog /var/log/apache2/metadata.ftp-master.debian.org-access.log privacy
+
+ Use common-static-base metadata.ftp-master.debian.org
+ AddDefaultCharset utf-8
+
+ ForceType text/plain
+
+
+
+# bits.debian.org
+######################
+
+ ServerName bits.debian.org
+ ServerAdmin debian-admin@lists.debian.org
+
+ ErrorLog /var/log/apache2/bits.debian.org-error.log
+
+ CustomLog /var/log/apache2/bits.debian.org-public-access.log privacy+geo
+
+
+ Use common-static-base bits.debian.org
+
+
+ >
+ RewriteEngine on
+
+ RewriteEngine On
+ RewriteCond %{REQUEST_URI} !^/feeds/
+ RewriteRule ^/(.*)$ https://bits.debian.org/$1 [R,L]
+ #RewriteRule ^/(.*)$ https://bits.debian.org/$1 [R=301,L]
+
+ Use static-bits.debian.org-base
+ CustomLog /var/log/apache2/bits.debian.org-access.log privacy
+
+
+ >
+ Use static-bits.debian.org-base
+ CustomLog /var/log/apache2/bits.debian.org-access.log privacyssl
+
+ Use common-debian-service-ssl bits.debian.org
+ Use common-ssl-HSTS
+
+
+# www.backports.org
+###################
+# www.backports.org is the historical place for the backports
+# website and archive. It is now a CNAME to backports.debian.org:
+# redirect http requests.
+ >
+ ServerName www.backports.org
+ ServerAlias lists.backports.org
+ ServerAdmin debian-admin@debian.org
+ RedirectPermanent /debian/ http://backports.debian.org/debian-backports/
+ RedirectPermanent /backports.org/ http://backports.debian.org/debian-backports/
+ RedirectPermanent /debian-backports/ http://backports.debian.org/debian-backports/
+ RedirectPermanent / http://backports.debian.org/
+
+
+
+# www.ports.debian.org
+######################
+ >
+ 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=*
+ <% if @lsbmajdistrelease > '7' -%>
+ Require all granted
+ <% else -%>
+ Order allow,deny
+ Allow from all
+ <% end -%>
+
+
+ AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
+ AddOutputFilter INCLUDES .xhtml
+
+
+ >
+ ServerName www.debian-ports.org
+ ServerAlias debian-ports.org
+ ServerAdmin debian-admin@debian.org
+ RedirectPermanent /archive/ http://archive.ports.debian.org/archive/
+ RedirectPermanent /debian-cd/ http://archive.ports.debian.org/debian-cd/
+ RedirectPermanent /debian-snapshot/ http://archive.ports.debian.org/debian-snapshot/
+ 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/
+
+
+# historical sites
+##################
+# now only redirects remain
+ >
+ ServerName women.debian.org
+ ServerAdmin debian-admin@debian.org
+
+ RedirectPermanent / http://www.debian.org/women/
+
+ RedirectPermanent /about/ http://www.debian.org/women/about
+ RedirectPermanent /contact/ http://www.debian.org/women/contact
+ RedirectPermanent /faqs/ http://www.debian.org/women/faq
+ RedirectPermanent /home/ http://www.debian.org/women/
+ RedirectPermanent /images/dw.png http://www.debian.org/women/dw.png
+ RedirectPermanent /involvement/ http://www.debian.org/women/participate
+ RedirectPermanent /mentoring/ http://www.debian.org/women/mentoring
+ RedirectPermanent /press/ http://wiki.debian.org/DebianWomen/Press
+ RedirectPermanent /profiles/ http://www.debian.org/women/profiles/
+
+
+ >
+ ServerName volatile.debian.org
+ ServerAlias volatile-master.debian.org
+ ServerAdmin debian-admin@debian.org
+ RedirectPermanent / http://www.debian.org/volatile/
+
+
+ >
+ ServerName ftp-master.metadata.debian.org
+ ServerAdmin debian-admin@debian.org
+ RedirectPermanent / http://metadata.ftp-master.debian.org/
+
# vim:ft=apache: