X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fntp%2Ftemplates%2Fntp.conf;h=bd14e5894cd998aa547fd13a8c8ae039131989e9;hb=320758f7417e40be264dab0c3970c185f9ff6a93;hp=fdbde074c959249c2b98c9c3a4575ce811cd1407;hpb=96f778299e93b25a6fe1b158ace05c44f29a4f06;p=mirror%2Fdsa-puppet.git diff --git a/modules/ntp/templates/ntp.conf b/modules/ntp/templates/ntp.conf index fdbde074c..bd14e5894 100644 --- a/modules/ntp/templates/ntp.conf +++ b/modules/ntp/templates/ntp.conf @@ -6,6 +6,8 @@ driftfile /var/lib/ntp/ntp.drift statsdir /var/log/ntpstats/ +# XXX REMOVE wheezy special handling when 670662 gets fixed + <% if %w{wheezy}.include?(scope.lookupvar('::lsbdistcodename')) -%> statistics loopstats peerstats clockstats filegen loopstats file loopstats type day enable @@ -35,7 +37,7 @@ server chronos.duth.gr iburst <% end -%> <% elsif fqdn == "ancina.debian.org" -%> server ntp.ugent.be iburst dynamic -<% elsif scope.lookupvar('site::nodeinfo')['misc']['natted'] -%> +<% elsif scope.lookupvar('site::nodeinfo')['misc']['natted'] or %w{wheezy}.include?(scope.lookupvar('::lsbdistcodename')) -%> # autokey doesn't work behind nat # merikanto's and orff's ipv4 IP, hard coded for the benefit of hosts