projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove double slashes on metadata.ftp-master.debian.org
[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
ad829e2
..
738ad3a
100644
(file)
--- a/
modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/
modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@
-22,6
+22,11
@@
</Macro>
<Macro vstatic-vhost-extra-metadata.ftp-master.debian.org>
</Macro>
<Macro vstatic-vhost-extra-metadata.ftp-master.debian.org>
+ # Rewrite away double slashes
+ RewriteEngine on
+ RewriteCond %{THE_REQUEST} //
+ RewriteRule ^.*$ $0 [R=302,L,NE]
+
AddDefaultCharset utf-8
<LocationMatch "/changelogs/(main|contrib|non-free)">
ForceType text/plain
AddDefaultCharset utf-8
<LocationMatch "/changelogs/(main|contrib|non-free)">
ForceType text/plain
@@
-157,7
+162,7
@@
vhost(lines, "rtc.debian.org" , :ssl => true)
vhost(lines, "onion.debian.org" , :ssl => true)
vhost(lines, "bits.debian.org" , :ssl => true, :extra => true)
vhost(lines, "onion.debian.org" , :ssl => true)
vhost(lines, "bits.debian.org" , :ssl => true, :extra => true)
-vhost(lines, "micronews.debian.
net
" , :ssl => true)
+vhost(lines, "micronews.debian.
org
" , :ssl => true)
vhost(lines, "metadata.ftp-master.debian.org", :extra => true)
vhost(lines, "10years.debconf.org" , :ssl => true)
vhost(lines, "metadata.ftp-master.debian.org", :extra => true)
vhost(lines, "10years.debconf.org" , :ssl => true)