X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=5064c8f50475467275cee168eab8a0d72a47f4a4;hb=a99babdcddb9c2f776c0a7f8355361caffc6ec20;hp=cdfd0454e63264a2dda773e405465c71b362faf1;hpb=8d85c820153bcffa106baf634bfec7eb7d6b37af;p=dsa-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 cdfd0454..5064c8f5 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -2,10 +2,57 @@
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 incoming.debian.org
Use common-static-vhost news.debian.net
-Use common-static-vhost-with-extra ftp-master.metadata.debian.org "AddDefaultCharset utf-8"
+Use common-static-vhost debaday.debian.net
+Use common-static-vhost debdeltas.debian.net
+Use common-static-vhost-with-extra metadata.ftp-master.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-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"
+
+# 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.
@@ -20,6 +67,59 @@ Use common-static-vhost-with-extra ftp-master.metadata.debian.org "AddDefaultCha
+# 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 -%>
+
+
+ DefaultType text/plain
+ 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
@@ -36,4 +136,18 @@ Use common-static-vhost-with-extra ftp-master.metadata.debian.org "AddDefaultCha
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: