projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Keep postgresql-client-9.6 on backuphost
[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
ceed2d6
..
da10107
100644
(file)
--- a/
modules/apache2/templates/default-debian.org.erb
+++ b/
modules/apache2/templates/default-debian.org.erb
@@
-10,11
+10,9
@@
CustomLog /var/log/apache2/access.log privacy
DocumentRoot /srv/www/default.debian.org/htdocs
CustomLog /var/log/apache2/access.log privacy
DocumentRoot /srv/www/default.debian.org/htdocs
- <% if @lsbmajdistrelease > '7' -%>
<Directory /srv/www/default.debian.org/htdocs>
Require all granted
</Directory>
<Directory /srv/www/default.debian.org/htdocs>
Require all granted
</Directory>
- <% end -%>
HostnameLookups Off
UseCanonicalName Off
HostnameLookups Off
UseCanonicalName Off
@@
-23,8
+21,5
@@
<IfModule mod_userdir.c>
UserDir disabled
</IfModule>
<IfModule mod_userdir.c>
UserDir disabled
</IfModule>
-<% if hostname == "spohr" -%>
- Alias /debian "/srv/mirrors/ftp.debian.org/ftp"
-<% end -%>
</VirtualHost>
# vim:set syn=apache:
</VirtualHost>
# vim:set syn=apache: