X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Ftemplates%2Fdefault-debian.org.erb;h=0c9eff39a2901e9e2d6aacfbd45784ae41ff42ff;hb=8314f82dff0956119ced6b782c9c6df00508216e;hp=ceed2d6f47f5e3bf6ee6d0ad1377384c13839604;hpb=e576b9593480be04c19a0e3fa648967a1c2f3c85;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/templates/default-debian.org.erb b/modules/apache2/templates/default-debian.org.erb
index ceed2d6f4..0c9eff39a 100644
--- 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
-	<% if @lsbmajdistrelease > '7' -%>
+	<% if scope.call_function('versioncmp', [@lsbmajdistrelease, '7']) > 0 -%>
 	<Directory /srv/www/default.debian.org/htdocs>
 		Require all granted
 	</Directory>
@@ -23,8 +23,5 @@
 	<IfModule mod_userdir.c>
 		UserDir disabled
 	</IfModule>
-<% if hostname == "spohr" -%>
-        Alias /debian "/srv/mirrors/ftp.debian.org/ftp"
-<% end -%>
 </VirtualHost>
 # vim:set syn=apache: