From 9217e0dc65488bb510ddc24eda4a4ae40b6a2e80 Mon Sep 17 00:00:00 2001
From: Shubham Shinde <shubham.shinde@perforce.com>
Date: Mon, 14 Jul 2025 13:17:53 +0530
Subject: [PATCH 1/4] Update metadata json

---
 metadata.json | 56 ++-------------------------------------------------
 1 file changed, 2 insertions(+), 54 deletions(-)

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"
       ]
     }
   ],

From 04ca8300a8b6b94cdc2ed7a42e3e6063aa48826e Mon Sep 17 00:00:00 2001
From: Shubham Shinde <shubham.shinde@perforce.com>
Date: Mon, 14 Jul 2025 19:12:13 +0530
Subject: [PATCH 2/4] Update some settings

---
 manifests/config.pp                              | 5 ++++-
 spec/acceptance/ntp_user_and_daemon_opts_spec.rb | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/manifests/config.pp b/manifests/config.pp
index e2865c74..e09cef6b 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/ntpsec/ntpsec'
+      }
+      else {
         $daemon_config = '/etc/default/ntp'
       }
       if $ntp::daemon_extra_opts {
diff --git a/spec/acceptance/ntp_user_and_daemon_opts_spec.rb b/spec/acceptance/ntp_user_and_daemon_opts_spec.rb
index 9c3cf81e..b5bb00f2 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') || os[:release].start_with?('24.04'))
   ntpd_opts_match = %r{(OPTIONS|NTPD_OPTS)='-g -i /var/lib/ntpsec'}
   chroot_dir = '/var/lib/ntpsec'
 else

From dc236fdaea7106c6e2044bb2820f1516db74ecbf Mon Sep 17 00:00:00 2001
From: Shubham Shinde <shubham.shinde@perforce.com>
Date: Mon, 14 Jul 2025 19:16:02 +0530
Subject: [PATCH 3/4] Fix rubocop offense

---
 spec/acceptance/ntp_user_and_daemon_opts_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/acceptance/ntp_user_and_daemon_opts_spec.rb b/spec/acceptance/ntp_user_and_daemon_opts_spec.rb
index b5bb00f2..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') || os[:release].start_with?('24.04'))
+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

From 0619db96e7615f76c0d76f74ab796f8a3d47e822 Mon Sep 17 00:00:00 2001
From: Shubham Shinde <shubham.shinde@perforce.com>
Date: Mon, 14 Jul 2025 19:22:25 +0530
Subject: [PATCH 4/4] Fix typo

---
 manifests/config.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/config.pp b/manifests/config.pp
index e09cef6b..59ddd343 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -36,7 +36,7 @@
       if $facts['os']['release']['major'] == '12' {
         $daemon_config = '/etc/ntpsec/ntp.conf'
       } elsif $facts['os']['release']['major'] == '24.04' {
-        $daemon_config = '/etc/ntpsec/ntpsec'
+        $daemon_config = '/etc/default/ntpsec'
       }
       else {
         $daemon_config = '/etc/default/ntp'