Merge pull request #342 from voxpupuli/fix-freebsd-directory

voxpupuli · Oct 24, 2021 · 9ecdd03 · 9ecdd03
2 parents 3fc9d20 + 27a0de4
commit 9ecdd03
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 16 deletions.
diff --git a/data/common.yaml b/data/common.yaml
@@ -7,3 +7,6 @@ openldap::server::group: "ldap"
 openldap::server::owner: "ldap"
 openldap::server::service: "slapd"
 openldap::server::escape_ldapi_ifs: false
+openldap::server::ldapi_ifs:
+  - "/"
+openldap::server::default_directory: "/var/lib/ldap"
diff --git a/data/os/FreeBSD.yaml b/data/os/FreeBSD.yaml
@@ -5,3 +5,6 @@ openldap::server::confdir: "/usr/local/etc/openldap/slapd.d"
 openldap::server::conffile: "/usr/local/etc/openldap/slapd.conf"
 openldap::server::package: "openldap24-server"
 openldap::server::escape_ldapi_ifs: true
+openldap::server::ldapi_ifs:
+  - "/var/run/openldap/ldapi"
+openldap::server::default_directory: "/var/db/openldap-data"
diff --git a/manifests/server.pp b/manifests/server.pp
@@ -7,6 +7,8 @@
   String[1] $owner,
   String[1] $group,
   Boolean $escape_ldapi_ifs,
+  Array[String[1]] $ldapi_ifs,
+  Stdlib::Absolutepath $default_directory,
   Optional[Boolean] $enable_chown                   = undef,
   Optional[Boolean] $service_hasstatus              = undef,
   Boolean $enable                                   = true,
@@ -17,7 +19,6 @@
   Hash $databases                                   = {},
   Array[String[1]] $ldap_ifs                        = ['/'],
   Array[String[1]] $ldaps_ifs                       = [],
-  Array[String[1]] $ldapi_ifs                       = ['/'],
   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
@@ -34,6 +34,14 @@
   }
   $slapd_ldap_urls = "${slapd_ldap_ifs} ${slapd_ldapi_ifs} ${slapd_ldaps_ifs}"
 
+  file { $openldap::server::confdir:
+    ensure => directory,
+    owner  => $openldap::server::owner,
+    group  => $openldap::server::group,
+    mode   => '0750',
+    force  => true,
+  }
+
   case $facts['os']['family'] {
     'Debian': {
       shellvar { 'slapd':
@@ -114,9 +122,13 @@
       # On FreeBSD we need to bootstrap slapd.d
       $ldif = file('openldap/cn-config.ldif')
       exec { 'bootstrap cn=config':
-        path    => '/usr/local/sbin',
-        command => "echo '${ldif}' | slapadd -n 0 -F ${openldap::server::confdir}",
-        creates => "${openldap::server::confdir}/cn=config.ldif",
+        path     => '/usr/local/sbin',
+        command  => "echo '${ldif}' | slapadd -n 0 -F ${openldap::server::confdir}",
+        creates  => "${openldap::server::confdir}/cn=config.ldif",
+        provider => 'shell',
+        user     => $openldap::server::owner,
+        group    => $openldap::server::group,
+        require  => File[$openldap::server::confdir],
       }
     }
     'Suse': {

diff --git a/manifests/server/database.pp b/manifests/server/database.pp
@@ -30,10 +30,7 @@
     'config'  => undef,
     'relay'   => undef,
     'ldap'    => undef,
-    default   => $directory ? {
-      undef   => '/var/lib/ldap',
-      default => $directory,
-    },
+    default   => $directory.lest || { $openldap::server::default_directory },
   }
 
   Class['openldap::server::service']

diff --git a/manifests/server/slapdconf.pp b/manifests/server/slapdconf.pp
@@ -2,14 +2,6 @@
 class openldap::server::slapdconf {
   include openldap::server
 
-  file { $openldap::server::confdir:
-    ensure => directory,
-    owner  => $openldap::server::owner,
-    group  => $openldap::server::group,
-    mode   => '0750',
-    force  => true,
-  }
-
   if $openldap::server::ssl_cert {
     if $openldap::server::ssl_key {
       openldap::server::globalconf { 'TLSCertificate':