Muehlenhoff has submitted this change and it was merged.
Change subject: openldap: Allow specifying an additional set of LDAP schemas
......................................................................
openldap: Allow specifying an additional set of LDAP schemas
Bug: T101299
Change-Id: I376e2d320fc555cb069c27f9b18d7cd4af6879ad
---
M modules/openldap/manifests/init.pp
M modules/openldap/templates/slapd.erb
2 files changed, 8 insertions(+), 0 deletions(-)
Approvals:
Muehlenhoff: Verified; Looks good to me, approved
Alexandros Kosiaris: Looks good to me, but someone else must approve
diff --git a/modules/openldap/manifests/init.pp
b/modules/openldap/manifests/init.pp
index 95fc7cc..d2d0e72 100644
--- a/modules/openldap/manifests/init.pp
+++ b/modules/openldap/manifests/init.pp
@@ -24,6 +24,8 @@
# Optional. TLS enable the server. The path to the certificate file
# $ca
# Optional. TLS enable the server. The path to the CA certificate file
+# $extra_schemas
+# Optional. A list of schema files relative to the /etc/ldap/schema
directory
#
# Actions:
# Install/configure slapd
@@ -46,6 +48,7 @@
$certificate=undef,
$key=undef,
$ca=undef,
+ $extra_schemas=undef,
) {
require_package('slapd', 'ldap-utils', 'python-ldap')
diff --git a/modules/openldap/templates/slapd.erb
b/modules/openldap/templates/slapd.erb
index 05e85f8..189c7ee 100644
--- a/modules/openldap/templates/slapd.erb
+++ b/modules/openldap/templates/slapd.erb
@@ -15,6 +15,11 @@
include /etc/ldap/schema/samba.schema
include /etc/ldap/schema/ppolicy.schema
+<% if @extra_schemas -%>
+ <%- @extra_schemas.each do |extra_schema| %>
+include /etc/ldap/schema/<%= extra_schema %>
+<% end %>
+<% end -%>
# Where the pid file is put. The init.d script
# will not stop the server if you change this.
pidfile /var/run/slapd/slapd.pid
--
To view, visit https://gerrit.wikimedia.org/r/250010
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I376e2d320fc555cb069c27f9b18d7cd4af6879ad
Gerrit-PatchSet: 8
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
