X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fntpdate%2Ftemplates%2Fetc-default-ntpdate.erb;h=5d8b3524c207ff89d3f4f1559647d04c4ea75da9;hb=683ffc212c9c3a4d7e4a4ff98c94fb52a75a02ca;hp=a75d9488ad2508ccbf5a9962bde2dce375ee00fc;hpb=7c9af8bba4c3bef111049a5f27bdaa190ee73ac6;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ntpdate/templates/etc-default-ntpdate.erb b/modules/ntpdate/templates/etc-default-ntpdate.erb
index a75d9488a..5d8b3524c 100644
--- a/modules/ntpdate/templates/etc-default-ntpdate.erb
+++ b/modules/ntpdate/templates/etc-default-ntpdate.erb
@@ -14,14 +14,9 @@ NTPDATE_USE_NTP_CONF=no
 NTPSERVERS=""
 <%=
 	out = []
-	if fqdn == "ancina.debian.org"
-		ntpservers = %w{ntp.ugent.be}
-	else
-		ntpservers = %w{merikanto.debian.org orff.debian.org ravel.debian.org busoni.debian.org}
-	end
 
 	require 'resolv'
-	ntpservers.each do |n|
+	[scope.lookupvar('ntpservers')].flatten.each do |n|
 		begin
 			ip = Resolv.getaddress(n)
 			out << "NTPSERVERS=\"$NTPSERVERS #{ip}\" # #{n}"
@@ -33,4 +28,4 @@ NTPSERVERS=""
 %>
 
 # Additional options to pass to ntpdate
-NTPOPTIONS=""
+NTPOPTIONS="-u"  # work around broken firewalls