Allow RHEL8+ to configure the slapd binary when needed

voxpupuli · Dec 11, 2024 · 8549439 · 8549439
1 parent 28a4084
commit 8549439
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 1 deletion.
diff --git a/REFERENCE.md b/REFERENCE.md
@@ -474,6 +474,7 @@ The following parameters are available in the `openldap::server` class:
 * [`databases`](#-openldap--server--databases)
 * [`ldap_ifs`](#-openldap--server--ldap_ifs)
 * [`ldaps_ifs`](#-openldap--server--ldaps_ifs)
+* [`slapd_path`](#-openldap--server--slapd_path)
 * [`slapd_params`](#-openldap--server--slapd_params)
 * [`ldap_port`](#-openldap--server--ldap_port)
 * [`ldap_address`](#-openldap--server--ldap_address)
@@ -652,6 +653,14 @@ Data type: `Array[String[1]]`
 
 Default value: `[]`
 
+##### <a name="-openldap--server--slapd_path"></a>`slapd_path`
+
+Data type: `Optional[Stdlib::Absolutepath]`
+
+
+
+Default value: `undef`
+
 ##### <a name="-openldap--server--slapd_params"></a>`slapd_params`
 
 Data type: `Optional[String]`

diff --git a/manifests/server.pp b/manifests/server.pp
@@ -27,6 +27,7 @@
   Hash $databases                                   = {},
   Array[String[1]] $ldap_ifs                        = ['/'],
   Array[String[1]] $ldaps_ifs                       = [],
+  Optional[Stdlib::Absolutepath] $slapd_path        = undef,
   Optional[String] $slapd_params                    = undef,
   Optional[Stdlib::Port] $ldap_port                 = undef,
   Optional[Stdlib::IP::Address] $ldap_address       = undef,

diff --git a/manifests/server/config.pp b/manifests/server/config.pp
@@ -2,6 +2,7 @@
 class openldap::server::config {
   include openldap::server
 
+  $slapd_path          = $openldap::server::slapd_path
   $slapd_params        = $openldap::server::slapd_params
   $owner               = $openldap::server::owner
   $group               = $openldap::server::group
@@ -120,13 +121,18 @@
         }
       }
       if versioncmp($facts['os']['release']['major'], '8') >= 0 {
+        if $slapd_path != undef {
+          $real_slapd_path = $slapd_path
+        } else {
+          $real_slapd_path = '/usr/sbin/slapd'
+        }
         systemd::dropin_file { 'puppet.conf':
           unit    => "${openldap::server::service}.service",
           content => join([
               '[Service]',
               'EnvironmentFile=/etc/sysconfig/slapd',
               'ExecStart=',
-              "ExecStart=/usr/sbin/slapd -u ${openldap::server::owner} -h \${SLAPD_URLS} \$SLAPD_OPTIONS",
+              "ExecStart=${real_slapd_path} -u ${openldap::server::owner} -h \${SLAPD_URLS} \$SLAPD_OPTIONS",
           ], "\n"),
         }
       }

diff --git a/spec/classes/openldap_server_config_spec.rb b/spec/classes/openldap_server_config_spec.rb
@@ -15,6 +15,12 @@
         it { is_expected.not_to contain_openldap__globalconf('TLSCertificateFile') }
         it { is_expected.not_to contain_openldap__globalconf('TLSCertificateKeyFile') }
         it { is_expected.not_to contain_openldap__globalconf('TLSCACertificateFile') }
+
+        if (facts[:os]['family'] == 'RedHat') && (facts[:os]['release']['major'].to_i >= 8)
+          it { is_expected.to contain_systemd__dropin_file('puppet.conf') }
+        else
+          it { is_expected.not_to contain_systemd__dropin_file('puppet.conf') }
+        end
       end
     end
 
@@ -35,5 +41,26 @@
         it { is_expected.to contain_shellvar('krb5_client_ktname').with(value: '/etc/krb5.keytab') }
       end
     end
+
+    context 'with a server binary set' do
+      let(:facts) do
+        facts
+      end
+
+      let :pre_condition do
+        "class {'openldap::server': slapd_path => '/some/odd/path', }"
+      end
+
+      it { is_expected.to compile.with_all_deps }
+
+      case facts[:os]['family']
+      when 'RedHat'
+        if (facts[:os]['release']['major'].to_i >= 8)
+          it {
+            is_expected.to contain_systemd__dropin_file('puppet.conf').with_content('^ExecStart=/some/odd/path')
+          }
+        end
+      end
+    end
   end
 end