projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop m68k@buildd.debian.org -> m68k-build@nocrew.org rewrite
[mirror/dsa-puppet.git]
/
modules
/
ntpdate
/
templates
/
etc-default-ntpdate.erb
diff --git
a/modules/ntpdate/templates/etc-default-ntpdate.erb
b/modules/ntpdate/templates/etc-default-ntpdate.erb
index
a75d948
..
5d8b352
100644
(file)
--- 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 = []
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'
require 'resolv'
-
ntpservers
.each do |n|
+
[scope.lookupvar('ntpservers')].flatten
.each do |n|
begin
ip = Resolv.getaddress(n)
out << "NTPSERVERS=\"$NTPSERVERS #{ip}\" # #{n}"
begin
ip = Resolv.getaddress(n)
out << "NTPSERVERS=\"$NTPSERVERS #{ip}\" # #{n}"
@@
-33,4
+28,4
@@
NTPSERVERS=""
%>
# Additional options to pass to ntpdate
%>
# Additional options to pass to ntpdate
-NTPOPTIONS="
"
+NTPOPTIONS="
-u" # work around broken firewalls