Remove files from chrony.d to avoid unmanaged configuration options. Signed-off-by: Georg Pfuetzenreuter <georg.pfuetzenreuter@suse.com>pull/40/head
@@ -10,6 +10,15 @@ | |||
include: | |||
- {{ sls_package_install }} | |||
{%- if chrony.confd is string %} | |||
chrony-config-conf.d: | |||
file.directory: | |||
- name: {{ chrony.confd }} | |||
- clean: True | |||
- require: | |||
- sls: {{ sls_package_install }} | |||
{%- endif %} | |||
chrony-config-file-file-managed: | |||
file.managed: | |||
- name: {{ chrony.config }} |
@@ -6,6 +6,7 @@ chrony: | |||
service: | |||
name: chronyd | |||
config: /etc/chrony.conf | |||
confd: false | |||
ntpservers: | |||
- '0.us.pool.ntp.org' | |||
- '1.us.pool.ntp.org' |
@@ -60,6 +60,9 @@ openSUSE: | |||
- 'maxdistance 6' | |||
- 'logchange 0.1' | |||
Suse: | |||
confd: /etc/chrony.d | |||
Gentoo: | |||
package: net-misc/chrony | |||
config: /etc/chrony/chrony.conf |
@@ -4,6 +4,7 @@ | |||
keyfile = 'keyfile ' | |||
driftfile = '/var/lib/chrony/' | |||
logdir = 'logdir /var/log/chrony' | |||
confd = nil | |||
case platform[:name] | |||
when 'debian', 'ubuntu' | |||
config_file = '/etc/chrony/chrony.conf' | |||
@@ -13,6 +14,11 @@ when 'gentoo' | |||
config_file = '/etc/chrony/chrony.conf' | |||
keyfile += '/etc/chrony.keys' | |||
driftfile += 'drift' | |||
when 'suse' | |||
config_file = '/etc/chrony.conf' | |||
keyfile += '/etc/chrony.keys' | |||
driftfile += 'drift' | |||
confd = '/etc/chrony.d' | |||
else | |||
config_file = '/etc/chrony.conf' | |||
keyfile += '/etc/chrony.keys' | |||
@@ -35,4 +41,9 @@ control 'Chrony configuration' do | |||
its('content') { should include 'pool 0.debian.pool.ntp.org iburst' } | |||
its('content') { should include 'pool 1.centos.pool.ntp.org' } | |||
end | |||
if !confd.nil? | |||
describe directory(confd) do | |||
its('size') { should be 0 } | |||
end | |||
end | |||
end |