Skip to content

SUSE: Remove files in chrony.d #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

SUSE: Remove files in chrony.d #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
603c9ab
fix(suse): remove files in chrony.d
tacerus Jun 15, 2023
14939e4
fix(suse): preserve pool.conf
tacerus Oct 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions chrony/config/file.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,17 @@
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 }}
- file: chrony-config-file-file-managed
- file: chrony-config-file-pool-file-managed
{%- endif %}

chrony-config-file-file-managed:
file.managed:
- name: {{ chrony.config }}
Expand All @@ -25,3 +36,11 @@ chrony-config-file-file-managed:
chrony: {{ chrony|json }}
- require:
- sls: {{ sls_package_install }}

chrony-config-file-pool-file-managed:
file.managed:
- name: {{ chrony.confd }}/pool.conf
- create: False
- replace: False
- require:
- sls: {{ sls_package_install }}
1 change: 1 addition & 0 deletions chrony/defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
3 changes: 3 additions & 0 deletions chrony/osfamilymap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 11 additions & 0 deletions test/integration/default/controls/config_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -13,6 +14,11 @@
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'
Expand All @@ -35,4 +41,9 @@
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