Merge pull request 'fix: include common::system::authentication::sudo class to satisfy the require which calls the profile part' (#1373) from fix/remove-sudoers-class-invocation into master

Reviewed-on: https://gitea.obmondo.com/EnableIT/LinuxAid/pulls/1373

Author: ashish1099

modules/enableit/common/manifests/setup.pp

@@ -17,7 +17,6 @@
   Stdlib::Absolutepath  $__opt_dir  = '/opt/obmondo',
   Stdlib::Absolutepath  $__bin_dir  = '/opt/obmondo/bin',
 ) {
-
   # Create Obmondo group for exporter to run under this group
   group { 'obmondo':
     ensure => present,
@@ -27,8 +26,8 @@
 
   file {
     default:
-    ensure => ensure_dir($::obmondo_monitor), #lint:ignore:top_scope_facts
-    noop   => $noop_value,
+      ensure => ensure_dir($::obmondo_monitor), #lint:ignore:top_scope_facts
+      noop   => $noop_value,
       ;
 
     [
@@ -38,6 +37,7 @@
       "${__opt_dir}/home",
       "${__opt_dir}/share",
       "${__opt_dir}/etc",
+      "${__conf_dir}/sudoers.d",
     ]:
       ;
   }

modules/enableit/eit_users/manifests/user.pp

@@ -16,7 +16,6 @@
   Array[Eit_types::Ssh_pubkey]        $ssh_authorized_keys = [],
   Eit_types::Noop_Value               $noop_value          = undef,
 ) {
-
   # Make sure we don't try to set the homedir of root to `/home/root`, unless
   # the $home parameter is set
   $_homedir = pick($home, $name ? {

modules/enableit/profile/manifests/system/sudoers.pp

@@ -4,18 +4,8 @@
   Eit_types::Sudoers   $sudoers       = $common::system::authentication::sudo::sudoers,
   Stdlib::Absolutepath $sudoers_d_dir = $common::system::authentication::sudo::sudoers_d_dir,
 ) {
-
   contain sudo::params
 
-  # Setup the directory
-  file { $sudoers_d_dir :
-    ensure  => directory,
-    purge   => true,
-    recurse => true,
-    noop    => false,
-    before  => Class['sudo'],
-  }
-
   # Some files in sudoers have wrong permissions, which can cause the execution
   # of `visudo -c` to fail. If this happens then sudoers rules won't be
   # installed, even if they're perfectly valid and the error only happens
@@ -33,7 +23,7 @@
   $_sudoedit_paths = [
     '/bin/sudoedit',
     '/usr/bin/sudoedit',
-    ]
+  ]
 
   Package {
     noop   => false,

modules/enableit/profile/manifests/system/sudoers/conf.pp

@@ -8,9 +8,6 @@
   Optional[String]                  $template   = undef,
   Eit_types::Noop_Value             $noop_value = undef,
 ) {
-
-  include profile::system::sudoers
-
   $sudoers_d_dir = lookup('common::system::authentication::sudo::sudoers_d_dir', Stdlib::Absolutepath, 'first', '/etc/obmondo/sudoers.d')
 
   $_sudo_conf_name = safe_string($name)
@@ -21,9 +18,7 @@
   }
 
   if (!$content or $content.size == 0) and !$source {
-    fail("Broken sudoers rule; content is empty! as well as no source file has been provided
-name: ${name}
-")
+    fail("Broken sudoers rule; content is empty! as well as no source file has been provided name: ${name}")
   }
 
   sudo::conf { $_sudo_conf_name:
@@ -36,5 +31,4 @@
     noop            => $noop_value,
     require         => File[$sudoers_d_dir],
   }
-
 }