diff options
Diffstat (limited to 'zarb-ml/mageia-sysadm/attachments/20101109/3dd92efc/attachment-0001.html')
| -rw-r--r-- | zarb-ml/mageia-sysadm/attachments/20101109/3dd92efc/attachment-0001.html | 130 |
1 files changed, 130 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/attachments/20101109/3dd92efc/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101109/3dd92efc/attachment-0001.html new file mode 100644 index 000000000..67986c42a --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101109/3dd92efc/attachment-0001.html @@ -0,0 +1,130 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" +"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /> +<title>[211] - replace hardcoded domain by a variable, to ease reuse of the module </title> +</head> +<body> + +<style type="text/css"><!-- +#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } +#msg dl.meta dt { float: left; width: 6em; font-weight: bold; } +#msg dt:after { content:':';} +#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } +#msg dl a { font-weight: bold} +#msg dl a:link { color:#fc3; } +#msg dl a:active { color:#ff0; } +#msg dl a:visited { color:#cc6; } +h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } +#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; } +#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; } +#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; } +#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; } +#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; } +#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } +#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; } +#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; } +#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; } +#logmsg pre { background: #eee; padding: 1em; } +#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;} +#logmsg dl { margin: 0; } +#logmsg dt { font-weight: bold; } +#logmsg dd { margin: 0; padding: 0 0 0.5em 0; } +#logmsg dd:before { content:'\00bb';} +#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; } +#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; } +#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; } +#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; } +#logmsg table th.Corner { text-align: left; } +#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; } +#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; } +#patch { width: 100%; } +--></style> +<div id="msg"> +<dl class="meta"> +<dt>Revision</dt> <dd>211</dd> +<dt>Author</dt> <dd>misc</dd> +<dt>Date</dt> <dd>2010-11-09 03:21:57 +0100 (Tue, 09 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>- replace hardcoded domain by a variable, to ease reuse of the module </pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesopenldaptemplatesslapdconf">puppet/modules/openldap/templates/slapd.conf</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesopenldaptemplatesslapdconf">Modified: puppet/modules/openldap/templates/slapd.conf</a> +=================================================================== +--- 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 + + +</pre></div> + +</body> +</html>
\ No newline at end of file |