X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-debug.mirrors.debian.org.erb;h=bcc57d6bd88dbf7ed5a74525420da138480b14ec;hb=0578c547ab8910fbec58d3c9ac68780d3df316b8;hp=e29a23c06d7d365aa410c95e92722f591aae348e;hpb=733d6e2a787803dcf21e5dab583ce811bdefba7d;p=mirror%2Fdsa-puppet.git
diff --git a/modules/roles/templates/apache-debug.mirrors.debian.org.erb b/modules/roles/templates/apache-debug.mirrors.debian.org.erb
index e29a23c06..bcc57d6bd 100644
--- a/modules/roles/templates/apache-debug.mirrors.debian.org.erb
+++ b/modules/roles/templates/apache-debug.mirrors.debian.org.erb
@@ -4,22 +4,22 @@
##
>
- ServerAdmin webmaster@debian.org
- ServerName debug.mirrors.debian.org
+ ServerAdmin debian-admin@debian.org
+ ServerName debug.mirrors.debian.org
+ <% if scope.function_onion_global_service_hostname(['debug.mirrors.debian.org']) -%>
+ ServerAlias <%= scope.function_onion_global_service_hostname(['debug.mirrors.debian.org']) %>
+ <% end %>
- RedirectMatch "^/$" /debian-debug/
- Alias /debian-debug /srv/mirrors/debian-debug
+ RedirectMatch "^/$" /debian-debug/
+ Alias /debian-debug /srv/mirrors/debian-debug
- ErrorLog /var/log/apache2/debug.mirrors.debian.org-error.log
- LogLevel warn
- CustomLog /var/log/apache2/debug.mirrors.debian.org-access.log privacy
-
-
- Require all granted
- IndexOptions NameWidth=* +SuppressDescription
- Options +Indexes
- Options +FollowSymLinks
-
-
+ ErrorLog /var/log/apache2/debug.mirrors.debian.org-error.log
+ CustomLog /var/log/apache2/debug.mirrors.debian.org-access.log privacy
+ Use ftp-archive /srv/mirrors/debian-debug
+
+ UserDir disabled
+
+
+# vim:set syn=apache: