Merge pull request #195 from jcpunk/wtmp-rhel9

Update defaults to match RHEL8/9
voxpupuli · Jul 13, 2022 · ae480a5 · ae480a5
2 parents 53f422e + dab1462
commit ae480a5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -104,10 +104,12 @@
       $configdir     = '/etc'
       $root_group    = 'root'
       $logrotate_bin = '/usr/sbin/logrotate'
+
+      $wtmp_missingok = versioncmp($facts['os']['release']['major'],'8') >= 0
       $base_rules = {
         'wtmp' => {
           path        => '/var/log/wtmp',
-          missingok   => false,
+          missingok   => $wtmp_missingok,
           create_mode => '0664',
           minsize     => '1M',
         },

diff --git a/metadata.json b/metadata.json
@@ -26,7 +26,9 @@
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "7"
+        "7",
+        "8",
+        "9"
       ]
     },
     {
@@ -50,7 +52,9 @@
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "7"
+        "7",
+        "8",
+        "9"
       ]
     },
     {

diff --git a/spec/classes/defaults_spec.rb b/spec/classes/defaults_spec.rb
@@ -67,7 +67,7 @@
         is_expected.to contain_logrotate__rule('wtmp').with(
           'path' => '/var/log/wtmp',
           'create_mode' => '0664',
-          'missingok' => false,
+          'missingok' => facts[:operatingsystemmajrelease].to_i >= 8,
           'minsize' => '1M',
           'create' => true,
           'create_owner' => 'root',

diff --git a/spec/defines/rule_spec.rb b/spec/defines/rule_spec.rb
@@ -720,7 +720,7 @@
     end
     let(:facts) do
       {
-        os: { family: 'RedHat' },
+        os: { family: 'RedHat', release: { major: '7' } },
         operatingsystemmajrelease: 7
       }
     end
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,9 @@ @@
         {
           "operatingsystem": "CentOS",
           "operatingsystemrelease": [
-            "7"
+            "7",
+            "8",
+            "9"
           ]
         },
         {
@@ Expand All / @@ -50,7 +52,9 @@ @@
         {
           "operatingsystem": "RedHat",
           "operatingsystemrelease": [
-            "7"
+            "7",
+            "8",
+            "9"
           ]
         },
         {
@@ Expand Down @@