projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Use RedirectPermanent instead of RewriteRule"
[mirror/dsa-puppet.git]
/
modules
/
roles
/
templates
/
apache-ftp.ports.debian.org.erb
diff --git
a/modules/roles/templates/apache-ftp.ports.debian.org.erb
b/modules/roles/templates/apache-ftp.ports.debian.org.erb
index
d7cd67f
..
82bac23
100644
(file)
--- a/
modules/roles/templates/apache-ftp.ports.debian.org.erb
+++ b/
modules/roles/templates/apache-ftp.ports.debian.org.erb
@@
-3,7
+3,7
@@
## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
##
## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
##
-<VirtualHost <%= vhost_listen %> >
+<VirtualHost <%=
@
vhost_listen %> >
ServerAdmin debian-admin@debian.org
ServerName ftp.ports.debian.org
<% if scope.function_onion_global_service_hostname(['ftp.ports.debian.org']) -%>
ServerAdmin debian-admin@debian.org
ServerName ftp.ports.debian.org
<% if scope.function_onion_global_service_hostname(['ftp.ports.debian.org']) -%>
@@
-15,16
+15,10
@@
RedirectMatch "^/$" /debian-ports/
RedirectMatch "^/$" /debian-ports/
- Alias /debian-ports
/srv/mirrors/debian-ports
- Use ftp-archive
/srv/mirrors/debian-ports
+ Alias /debian-ports
<%= @archive_root %>
+ Use ftp-archive
<%= @archive_root %>
- Alias /debian-ports-cd /srv/mirrors/debian-ports-cd
- <Directory /srv/mirrors/debian-ports-cd>
- Require all granted
- IndexOptions NameWidth=*
- Options +Indexes
- Options +FollowSymLinks
- </Directory>
+ RedirectMatch "^/debian-ports-cd/.*$" https://cdimage.debian.org/cdimage/ports/
<IfModule mod_userdir.c>
UserDir disabled
<IfModule mod_userdir.c>
UserDir disabled