X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fntp%2Ftemplates%2Fntp.conf;h=ea9c506e3e974a13daf47329f594914d769d7145;hb=945f3f42f8b921e6432fbbd6b97dfd482b58a3b8;hp=4fc219f13414e58b78b3db1c8af107339f64c638;hpb=e92eea431bf48910e63f6f9ffdf3cce7b7e3a2fe;p=mirror%2Fdsa-puppet.git diff --git a/modules/ntp/templates/ntp.conf b/modules/ntp/templates/ntp.conf index 4fc219f13..ea9c506e3 100644 --- a/modules/ntp/templates/ntp.conf +++ b/modules/ntp/templates/ntp.conf @@ -21,11 +21,7 @@ server 1.debian.pool.ntp.org iburst dynamic server 2.debian.pool.ntp.org iburst dynamic server 3.debian.pool.ntp.org iburst dynamic -<% if @lsbmajdistrelease >= '8' -%> leapfile /usr/share/zoneinfo/leap-seconds.list -<% else -%> -leapfile /var/lib/ntp/leap-seconds.list -<% end -%> <% elsif scope.lookupvar('site::nodeinfo')['misc']['natted'] -%> # autokey doesn't work behind nat