projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change redirections about policy manual to 302, since a change back to the multi...
[mirror/dsa-puppet.git]
/
modules
/
roles
/
templates
/
apache-ftp.debian.org.erb
diff --git
a/modules/roles/templates/apache-ftp.debian.org.erb
b/modules/roles/templates/apache-ftp.debian.org.erb
index
576eec0
..
73cdb95
100644
(file)
--- a/
modules/roles/templates/apache-ftp.debian.org.erb
+++ b/
modules/roles/templates/apache-ftp.debian.org.erb
@@
-3,20
+3,33
@@
## 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 %>>
- ServerAdmin
webmaster
@debian.org
+<VirtualHost <%=
@
vhost_listen %>>
+ ServerAdmin
debian-admin
@debian.org
ServerName ftp.debian.org
ServerName ftp.debian.org
+ ServerAlias debian.anycast-test.mirrors.debian.org
<% if scope.function_onion_global_service_hostname(['ftp.debian.org']) -%>
ServerAlias <%= scope.function_onion_global_service_hostname(['ftp.debian.org']) %>
<% end %>
<% if scope.function_onion_global_service_hostname(['ftp.debian.org']) -%>
ServerAlias <%= scope.function_onion_global_service_hostname(['ftp.debian.org']) %>
<% end %>
+ ServerAlias debian.backend.mirrors.debian.org
+ ServerAlias *.debian.backend.mirrors.debian.org
+
+ AddCharset UTF-8 .txt
RedirectMatch "^/$" /debian/
RedirectMatch "^/$" /debian/
- Alias /debian/ <%= archive_root %>/
+ Alias /debian/ <%= @archive_root %>/
+ Alias /_health /run/dsa-mirror-health-ftp/health
+ <Directory /run/dsa-mirror-health-ftp/>
+ Require all granted
+ </Directory>
ErrorLog /var/log/apache2/ftp.debian.org-error.log
CustomLog /var/log/apache2/ftp.debian.org-access.log privacy
ErrorLog /var/log/apache2/ftp.debian.org-error.log
CustomLog /var/log/apache2/ftp.debian.org-access.log privacy
- Use ftp-archive <%= archive_root %>
+ Use ftp-archive <%= @archive_root %>
+
+ <IfModule mod_userdir.c>
+ UserDir disabled
+ </IfModule>
</VirtualHost>
# vim:set syn=apache:
</VirtualHost>
# vim:set syn=apache: