1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-sysadm] [211] - replace hardcoded domain by a variable, to ease reuse of the module
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B211%5D%20-%20replace%20hardcoded%20domain%20by%20a%20variable%2C%0A%20to%20ease%20reuse%20of%20the%20module&In-Reply-To=%3C20101109022157.5459D3F90D%40valstar.mageia.org%3E">
<META NAME="robots" CONTENT="index,nofollow">
<META http-equiv="Content-Type" content="text/html; charset=us-ascii">
<LINK REL="Previous" HREF="000431.html">
<LINK REL="Next" HREF="000466.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-sysadm] [211] - replace hardcoded domain by a variable, to ease reuse of the module</H1>
<B>root at mageia.org</B>
<A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B211%5D%20-%20replace%20hardcoded%20domain%20by%20a%20variable%2C%0A%20to%20ease%20reuse%20of%20the%20module&In-Reply-To=%3C20101109022157.5459D3F90D%40valstar.mageia.org%3E"
TITLE="[Mageia-sysadm] [211] - replace hardcoded domain by a variable, to ease reuse of the module">root at mageia.org
</A><BR>
<I>Tue Nov 9 03:21:57 CET 2010</I>
<P><UL>
<LI>Previous message: <A HREF="000431.html">[Mageia-sysadm] Question about Sympa
</A></li>
<LI>Next message: <A HREF="000466.html">[Mageia-sysadm] [211] - replace hardcoded domain by a variable, to ease reuse of the module
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#394">[ date ]</a>
<a href="thread.html#394">[ thread ]</a>
<a href="subject.html#394">[ subject ]</a>
<a href="author.html#394">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>Revision: 211
Author: misc
Date: 2010-11-09 03:21:57 +0100 (Tue, 09 Nov 2010)
Log Message:
-----------
- replace hardcoded domain by a variable, to ease reuse of the module
Modified Paths:
--------------
puppet/modules/openldap/templates/slapd.conf
Modified: puppet/modules/openldap/templates/slapd.conf
===================================================================
--- puppet/modules/openldap/templates/slapd.conf 2010-11-08 23:18:50 UTC (rev 210)
+++ puppet/modules/openldap/templates/slapd.conf 2010-11-09 02:21:57 UTC (rev 211)
@@ -1,3 +1,9 @@
+<%
+dc_suffix = 'dc=' + domain.gsub('.',',dc=')
+path_module_directory = "/usr/lib" + ( architecture == "x86_64" ? '64' : '') + "/openldap"
+
+%>
+
# slapd.conf template
include /usr/share/openldap/schema/core.schema
include /usr/share/openldap/schema/cosine.schema
@@ -26,10 +32,6 @@
pidfile /var/run/ldap/slapd.pid
argsfile /var/run/ldap/slapd.args
-<%
-path_module_directory = "/usr/lib" + ( architecture == "x86_64" ? '64' : '') + "/openldap"
-%>
-
modulepath <%= path_module_directory %>
moduleload back_monitor.la
moduleload syncprov.la
@@ -51,9 +53,9 @@
loglevel 256
database bdb
-suffix "dc=mageia,dc=org"
+suffix "<%= dc_suffix %>"
directory /var/lib/ldap
-rootdn "cn=manager,dc=mageia,dc=org"
+rootdn "cn=manager,<%= dc_suffix %>"
checkpoint 256 5
# 32Mbytes, can hold about 10k posixAccount entries
@@ -81,7 +83,7 @@
syncprov-sessionlog 100
overlay ppolicy
-ppolicy_default "cn=default,ou=Password Policies,dc=mageia,dc=org"
+ppolicy_default "cn=default,ou=Password Policies,<%= dc_suffix %>"
ppolicy_hash_cleartext yes
ppolicy_use_lockout yes
@@ -94,15 +96,15 @@
#refint_nothing "uid=LDAP Admin,ou=System Accounts,dc=example,dc=com"
authz-regexp "gidNumber=0\\\+uidNumber=0,cn=peercred,cn=external,cn=auth"
- "uid=Account Admin,ou=System Accounts,dc=mageia,dc=org"
-authz-regexp ^uid=([^,]+),cn=[^,]+,cn=auth$ uid=$1,ou=People,dc=mageia,dc=org
+ "uid=Account Admin,ou=System Accounts,<%= dc_suffix %>"
+authz-regexp ^uid=([^,]+),cn=[^,]+,cn=auth$ uid=$1,ou=People,<%= dc_suffix %>
include /etc/openldap/mandriva-dit-access.conf
database monitor
access to dn.subtree="cn=Monitor"
- by group.exact="cn=LDAP Monitors,ou=System Groups,dc=mageia,dc=org" read
- by group.exact="cn=LDAP Admins,ou=System Groups,dc=mageia,dc=org" read
+ by group.exact="cn=LDAP Monitors,ou=System Groups,<%= dc_suffix %>" read
+ by group.exact="cn=LDAP Admins,ou=System Groups,<%= dc_suffix %>" read
by * none
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20101109/3dd92efc/attachment.html>
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="000431.html">[Mageia-sysadm] Question about Sympa
</A></li>
<LI>Next message: <A HREF="000466.html">[Mageia-sysadm] [211] - replace hardcoded domain by a variable, to ease reuse of the module
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#394">[ date ]</a>
<a href="thread.html#394">[ thread ]</a>
<a href="subject.html#394">[ subject ]</a>
<a href="author.html#394">[ author ]</a>
</LI>
</UL>
<hr>
<a href="https://www.mageia.org/mailman/listinfo/mageia-sysadm">More information about the Mageia-sysadm
mailing list</a><br>
</body></html>
|
