Merge pull request #101 from StatensPensjonskasse/cleanup-debian-defa…

…ults Cleanup Debian defaults
voxpupuli · May 27, 2024 · 76c1c16 · 76c1c16
2 parents 4e2b5b8 + 7d43ed7
commit 76c1c16
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -9,22 +9,12 @@
       $trusted_cert_dir  = '/usr/local/share/ca-certificates'
       $distrusted_cert_dir = undef
       $update_cmd        = 'update-ca-certificates'
-      $cert_dir_group    = 'staff'
+      $cert_dir_group    = 'root'
+      $cert_dir_mode     = '0755'
       $ca_file_group     = 'root'
-      $ca_file_mode      = '0444'
+      $ca_file_mode      = '0644'
       $ca_file_extension = 'crt'
       $package_name      = 'ca-certificates'
-      case $facts['os']['name'] {
-        'Ubuntu': {
-          $cert_dir_mode     = '0755'
-        }
-        /(Debian|Kali)/: {
-          $cert_dir_mode     = '2665'
-        }
-        default: {
-          $cert_dir_mode     = '0755'
-        }
-      }
     }
     'RedHat': {
       $trusted_cert_dir    = '/etc/pki/ca-trust/source/anchors'

diff --git a/spec/classes/ca_cert_spec.rb b/spec/classes/ca_cert_spec.rb
@@ -5,8 +5,6 @@
     case facts[:os]['family']
     when 'Debian'
       trusted_cert_dir = '/usr/local/share/ca-certificates'
-      cert_dir_group   = 'staff'
-      cert_dir_mode = '2665' if facts[:os]['name'] == 'Debian'
     when 'RedHat'
       trusted_cert_dir = '/etc/pki/ca-trust/source/anchors'
       update_cmd       = 'update-ca-trust extract'