projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
new ssh key
[mirror/dsa-puppet.git]
/
modules
/
apache2
/
templates
/
default-debian.org.erb
diff --git
a/modules/apache2/templates/default-debian.org.erb
b/modules/apache2/templates/default-debian.org.erb
index
84f4533
..
167c4fe
100644
(file)
--- a/
modules/apache2/templates/default-debian.org.erb
+++ b/
modules/apache2/templates/default-debian.org.erb
@@
-7,27
+7,22
@@
ServerAdmin debian-admin@debian.org
ErrorLog /var/log/apache2/error.log
ServerAdmin debian-admin@debian.org
ErrorLog /var/log/apache2/error.log
- CustomLog /var/log/apache2/access.log
combined
+ CustomLog /var/log/apache2/access.log
privacy
DocumentRoot /srv/www/default.debian.org/htdocs
HostnameLookups Off
UseCanonicalName Off
ServerSignature On
DocumentRoot /srv/www/default.debian.org/htdocs
HostnameLookups Off
UseCanonicalName Off
ServerSignature On
-<%=
-out = case fqdn
- when "master.debian.org" then ""
-else
-"
+
<IfModule mod_userdir.c>
UserDir disabled
</IfModule>
<IfModule mod_userdir.c>
UserDir disabled
</IfModule>
-"
-end
+<%=
case fqdn
when "spohr.debian.org" then
out += "
case fqdn
when "spohr.debian.org" then
out += "
- Alias /debian \"/
org
/mirrors/ftp.debian.org/ftp\"
+ Alias /debian \"/
srv
/mirrors/ftp.debian.org/ftp\"
"
when "piatti.debian.org" then
out += "
"
when "piatti.debian.org" then
out += "