projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
serial on lobos/villa
[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
..
0c9eff3
100644
(file)
--- a/
modules/apache2/templates/default-debian.org.erb
+++ b/
modules/apache2/templates/default-debian.org.erb
@@
-10,7
+10,7
@@
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'
-%>
+ <% if
scope.call_function('versioncmp', [@lsbmajdistrelease, '7']) > 0
-%>
<Directory /srv/www/default.debian.org/htdocs>
Require all granted
</Directory>
<Directory /srv/www/default.debian.org/htdocs>
Require all granted
</Directory>
@@
-23,8
+23,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: