diff --git a/manifests/config.pp b/manifests/config.pp index e2865c74..59ddd343 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -35,7 +35,10 @@ 'Debian': { if $facts['os']['release']['major'] == '12' { $daemon_config = '/etc/ntpsec/ntp.conf' - } else { + } elsif $facts['os']['release']['major'] == '24.04' { + $daemon_config = '/etc/default/ntpsec' + } + else { $daemon_config = '/etc/default/ntp' } if $ntp::daemon_extra_opts { diff --git a/metadata.json b/metadata.json index cbf77954..e4f41d0a 100644 --- a/metadata.json +++ b/metadata.json @@ -14,63 +14,11 @@ } ], "operatingsystem_support": [ - { - "operatingsystem": "RedHat", - "operatingsystemrelease": [ - "7" - ] - }, - { - "operatingsystem": "CentOS", - "operatingsystemrelease": [ - "7" - ] - }, - { - "operatingsystem": "OracleLinux", - "operatingsystemrelease": [ - "7" - ] - }, - { - "operatingsystem": "Scientific", - "operatingsystemrelease": [ - "7" - ] - }, - { - "operatingsystem": "SLES", - "operatingsystemrelease": [ - "12", - "15" - ] - }, - { - "operatingsystem": "Debian", - "operatingsystemrelease": [ - "10", - "11", - "12" - ] - }, { "operatingsystem": "Ubuntu", "operatingsystemrelease": [ - "18.04", - "20.04", - "22.04" - ] - }, - { - "operatingsystem": "Solaris", - "operatingsystemrelease": [ - "11" - ] - }, - { - "operatingsystem": "AIX", - "operatingsystemrelease": [ - "7.1" + "22.04", + "24.04" ] } ], diff --git a/spec/acceptance/ntp_user_and_daemon_opts_spec.rb b/spec/acceptance/ntp_user_and_daemon_opts_spec.rb index 9c3cf81e..8cc67bf1 100644 --- a/spec/acceptance/ntp_user_and_daemon_opts_spec.rb +++ b/spec/acceptance/ntp_user_and_daemon_opts_spec.rb @@ -33,7 +33,7 @@ '/etc/default/ntp' end -if os[:family] == 'debian' && os[:release].start_with?('12') +if os[:family] == 'debian' && os[:release].start_with?('12', '24.04') ntpd_opts_match = %r{(OPTIONS|NTPD_OPTS)='-g -i /var/lib/ntpsec'} chroot_dir = '/var/lib/ntpsec' else