Reswizzle the PR based on review

voxpupuli · Jan 22, 2025 · 340bdfb · 340bdfb
1 parent b84f4d9
commit 340bdfb
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/manifests/server/config.pp b/manifests/server/config.pp
@@ -119,17 +119,16 @@
           value    => $slapd_ldap_urls,
         }
       }
-      if versioncmp($facts['os']['release']['major'], '8') >= 0 {
-        if $openldap::server::package == 'openldap-servers' {
-          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",
-            ], "\n"),
-          }
+      if versioncmp($facts['os']['release']['major'], '8') >= 0 and $openldap::server::package == 'openldap-servers' {
+        systemd::manage_dropin { 'puppet.conf':
+          unit          => "${openldap::server::service}.service",
+          service_entry => {
+            'EnvironmentFile' => '/etc/sysconfig/slapd',
+            'ExecStart'       => [
+              '',
+              "/usr/sbin/slapd -u ${openldap::server::owner} -h \${SLAPD_URLS} \$SLAPD_OPTIONS",
+            ],
+          },
         }
       }
     }