Alexandros Kosiaris has submitted this change and it was merged.
Change subject: openldap: Abide $datadir
......................................................................
openldap: Abide $datadir
There's a few places where /var/lib/ldap/corp/ is hardcoded which should
be overridable using $datadir.
Change-Id: Ie0e05911b3e2c027286f43bc72e5e08c96ddeac4
---
M modules/openldap/manifests/init.pp
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/openldap/manifests/init.pp
b/modules/openldap/manifests/init.pp
index c0db3d9..a75e0de 100644
--- a/modules/openldap/manifests/init.pp
+++ b/modules/openldap/manifests/init.pp
@@ -63,7 +63,7 @@
}
# our replication dir
- file { '/var/lib/ldap/corp/':
+ file { $datadir:
ensure => directory,
recurse => false,
owner => 'openldap',
@@ -121,12 +121,12 @@
# Relationships
Package['slapd'] -> File['/etc/ldap/slapd.conf']
Package['slapd'] -> File['/etc/default/slapd']
- Package['slapd'] -> File['/var/lib/ldap/corp/']
+ Package['slapd'] -> File[$datadir]
Package['slapd'] -> Exec['rm_slapd.d']
Exec['rm_slapd.d'] -> Service['slapd']
File['/etc/ldap/slapd.conf'] ~> Service['slapd'] # We also notify
File['/etc/default/slapd'] ~> Service['slapd'] # We also notify
- File['/var/lib/ldap/corp/'] -> Service['slapd']
+ File[$datadir] -> Service['slapd']
Package['slapd'] -> File['/etc/ldap/schema/rfc2307bis.schema']
Package['slapd'] -> File['/etc/ldap/schema/samba.schema']
File['/etc/ldap/schema/rfc2307bis.schema'] -> Service['slapd']
--
To view, visit https://gerrit.wikimedia.org/r/249718
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0e05911b3e2c027286f43bc72e5e08c96ddeac4
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
