From: Peter Palfrader Date: Mon, 20 May 2013 21:45:29 +0000 (+0200) Subject: another ntp cleanup X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=2b6aad517276bd65f95560b778d31335cc0a6175;p=mirror%2Fdsa-puppet.git another ntp cleanup --- diff --git a/modules/ntp/templates/ntp.conf b/modules/ntp/templates/ntp.conf index 935287c49..fea3e66ff 100644 --- a/modules/ntp/templates/ntp.conf +++ b/modules/ntp/templates/ntp.conf @@ -6,20 +6,11 @@ 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 -filegen peerstats file peerstats type day enable -filegen clockstats file clockstats type day enable -<% else -%> statistics loopstats peerstats clockstats cryptostats filegen loopstats file loopstats type day enable filegen peerstats file peerstats type day enable filegen clockstats file clockstats type day enable filegen cryptostats file cryptostats type day enable -<% end -%> crypto randfile /dev/urandom keysdir /etc/ntp.keys.d