</Macro>
<% end -%>
+<Macro vhost-network-test.debian.org-extra>
+ ServerAlias network-test-backend.debian.org
+</Macro>
+
+<Macro vhost-bits.debian.org-extra>
+ <IfModule mod_geoip.c>
+ CustomLog /var/log/apache2/bits.debian.org-public-access.log privacy+geo
+ </IfModule>
+</Macro>
+
+<Macro vhost-metadata.ftp-master.debian.org-extra>
+ AddDefaultCharset utf-8
+ <LocationMatch "/changelogs/(main|contrib|non-free)">
+ ForceType text/plain
+ </LocationMatch>
+</Macro>
<%=
-def vhost(lines, sn, type=nil, extra=nil)
+def vhost(lines, sn, type=nil)
if scope.function_has_static_component([sn])
t = 'common-static-vhost'
if type then t += "-#{type}"; end
- e = ''
- if extra then e += " #{extra}"; end
+ onion = scope.function_onion_global_service_hostname([sn])
+ onion = "unavailable-onion.invalid" if onion.nil?
- lines << "Use #{t} #{sn}#{e}"
+ lines << "Use #{t} #{sn} #{onion}"
end
end
vhost(lines, "news.debian.net" , "ssl")
vhost(lines, "debaday.debian.net" , "ssl")
vhost(lines, "timeline.debian.net" , "ssl")
-vhost(lines, "network-test.debian.org" , "with-extra", '"ServerAlias network-test-backend.debian.org"')
+vhost(lines, "network-test.debian.org" , "with-extra")
vhost(lines, "blends.debian.org" , "ssl")
vhost(lines, "wnpp-by-tags.debian.net" , "ssl")
vhost(lines, "security-team.debian.org", "ssl")
vhost(lines, "dsa.debian.org" , "ssl")
vhost(lines, "rtc.debian.org" , "ssl")
+vhost(lines, "bits.debian.org", "ssl-with-extra")
+vhost(lines, "metadata.ftp-master.debian.org", "with-extra")
+
vhost(lines, "10years.debconf.org" , "ssl")
vhost(lines, "debconf0.debconf.org", "ssl")
vhost(lines, "debconf1.debconf.org", "ssl")
vhost(lines, "fr.debconf.org" , "ssl")
vhost(lines, "miniconf10.debconf.org" , "ssl")
-vhost(lines, "deb.debian.org", "with-extra", '"Use vhost-deb.debian.org-extra"')
+vhost(lines, "deb.debian.org", "with-extra")
lines.join("\n")
-%>
######################
-# metadata.ftp-master.debian.org
-<% if scope.function_has_static_component(['metadata.ftp-master.debian.org']) -%>
-<VirtualHost <%= vhost_listen %> >
- 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
- <LocationMatch "/changelogs/(main|contrib|non-free)">
- ForceType text/plain
- </LocationMatch>
-</VirtualHost>
-<% end -%>
-
-######################
-# bits.debian.org
-<% if scope.function_has_static_component(['bits.debian.org']) -%>
-<Macro static-bits.debian.org-base>
- ServerName bits.debian.org
- ServerAdmin debian-admin@lists.debian.org
-
- ErrorLog /var/log/apache2/bits.debian.org-error.log
- <IfModule mod_geoip.c>
- CustomLog /var/log/apache2/bits.debian.org-public-access.log privacy+geo
- </IfModule>
+# release.debian.org
+<% if scope.function_has_static_component(['release.debian.org']) -%>
+Use common-dsa-vhost-https-redirect release.debian.org
+<VirtualHost <%= vhost_listen_443 %> >
+ ServerName release.debian.org
+ ServerAdmin debian-admin@debian.org
- Use common-static-base bits.debian.org
-</Macro>
+ ErrorLog /var/log/apache2/release.debian.org-error.log
+ CustomLog /var/log/apache2/release.debian.org-access.log privacy
-<Virtualhost <%= vhost_listen %> >
- RewriteEngine on
+ Use common-debian-service-ssl release.debian.org
+ Use common-ssl-HSTS
- RewriteEngine On
- RewriteCond %{REQUEST_URI} !^/feeds/
- RewriteRule ^/(.*)$ https://bits.debian.org/$1 [R,L]
- #RewriteRule ^/(.*)$ https://bits.debian.org/$1 [R=301,L]
+ Use common-static-base release.debian.org
- Use static-bits.debian.org-base
- CustomLog /var/log/apache2/bits.debian.org-access.log privacy
-</VirtualHost>
+ RewriteEngine on
+ RewriteRule ^/migration/$ /migration/testing.pl
+ RewriteRule ^/migration/search/(.+)/$ /migration/testing.pl?package=$1
+ RewriteCond %{QUERY_STRING} package=((.)(.*))
+ RewriteRule ^/migration/testing.pl /migration/cache/%2/%1.html [PT,L]
+ RewriteRule ^/migration/testing.pl /migration/cache/_index.html
-<Virtualhost <%= vhost_listen_443 %> >
- Use static-bits.debian.org-base
- CustomLog /var/log/apache2/bits.debian.org-access.log privacyssl
+ Alias /proposed-updates/ /srv/static.debian.org/mirrors/release.debian.org-pu/cur/
+ <Directory /srv/static.debian.org/mirrors/release.debian.org-pu/cur>
+ Require all granted
+ Options Indexes SymLinksIfOwnerMatch MultiViews
+ IndexOptions FancyIndexing NameWidth=*
- Use common-debian-service-ssl bits.debian.org
- Use common-ssl-HSTS
+ AddEncoding gzip .gz
+ FilterDeclare gzip CONTENT_SET
+ FilterProvider gzip inflate "%{req:Accept-Encoding} !~ /gzip/"
+ FilterChain gzip
+ <Files *.debdiff.gz>
+ ForceType text/plain
+ </Files>
+ </Directory>
</VirtualHost>
<% end -%>
Use common-dsa-vhost-https-redirect www.ports.debian.org
-<Virtualhost <%= vhost_listen_443 %> >
- ServerName www.ports.debian.org
- ServerAlias www.ports-backend.debian.org
+<Macro vhost-inner-www.ports.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
- Use common-debian-service-ssl www.ports.debian.org
- Use common-ssl-HSTS
<IfModule mod_userdir.c>
UserDir disabled
AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
AddOutputFilter INCLUDES .xhtml
+</Macro>
+
+<Virtualhost <%= vhost_listen_443 %> >
+ ServerName www.ports.debian.org
+ ServerAlias www.ports-backend.debian.org
+ Use common-debian-service-ssl www.ports.debian.org
+ Use common-ssl-HSTS
+ Use vhost-inner-www.ports.debian.org
</VirtualHost>
+<% if scope.function_onion_global_service_hostname(['www.ports.debian.org']) -%>
+<Virtualhost <%= vhost_listen %> >
+ ServerName <%= scope.function_onion_global_service_hostname(['www.ports.debian.org']) %>
+ Use vhost-inner-www.ports.debian.org
+</VirtualHost>
+<% end -%>
<% end -%>
<VirtualHost <%= vhost_listen %> >
RedirectPermanent / http://metadata.ftp-master.debian.org/
</VirtualHost>
-<VirtualHost <%= vhost_listen %> >
- ServerName release.debian.org
- ServerAdmin debian-admin@debian.org
- RedirectPermanent / https://release.debian.org/
-</VirtualHost>
-<VirtualHost <%= vhost_listen_443 %> >
- ServerName release.debian.org
- ServerAdmin debian-admin@debian.org
-
- ErrorLog /var/log/apache2/release.debian.org-error.log
- CustomLog /var/log/apache2/release.debian.org-access.log privacy
-
- Use common-debian-service-ssl release.debian.org
- Use common-ssl-HSTS
-
- <IfModule mod_userdir.c>
- UserDir disabled
- </IfModule>
- ServerSignature On
-
- DocumentRoot /srv/static.debian.org/mirrors/release.debian.org/cur
- <Directory /srv/static.debian.org/mirrors/release.debian.org/cur>
- AllowOverride FileInfo Indexes Options=Multiviews
- Options Multiviews Indexes FollowSymLinks Includes
- IndexOptions FancyIndexing NameWidth=*
- Require all granted
- </Directory>
-</VirtualHost>
-
# vim:ft=apache:
projects / mirror / dsa-puppet.git / blobdiff