diff options
Diffstat (limited to 'zarb-ml/mageia-sysadm/attachments/20101215/e57eaef8/attachment-0001.html')
| -rw-r--r-- | zarb-ml/mageia-sysadm/attachments/20101215/e57eaef8/attachment-0001.html | 285 |
1 files changed, 285 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/attachments/20101215/e57eaef8/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101215/e57eaef8/attachment-0001.html new file mode 100644 index 000000000..6bbcb2ece --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101215/e57eaef8/attachment-0001.html @@ -0,0 +1,285 @@ +<!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>[624] uniformisation of the name of variable used for password, so we know if this is ldap or postgresql at the first glance</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>624</dd> +<dt>Author</dt> <dd>misc</dd> +<dt>Date</dt> <dd>2010-12-15 13:24:46 +0100 (Wed, 15 Dec 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>uniformisation of the name of variable used for password, so we know if this is ldap or postgresql at the first glance</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesbugzillamanifestsinitpp">puppet/modules/bugzilla/manifests/init.pp</a></li> +<li><a href="#puppetmodulesbugzillatemplateslocalconfig">puppet/modules/bugzilla/templates/localconfig</a></li> +<li><a href="#puppetmodulesbugzillatemplatesparams">puppet/modules/bugzilla/templates/params</a></li> +<li><a href="#puppetmodulescatdapmanifestsinitpp">puppet/modules/catdap/manifests/init.pp</a></li> +<li><a href="#puppetmodulescatdaptemplatescatdap_localyml">puppet/modules/catdap/templates/catdap_local.yml</a></li> +<li><a href="#puppetmodulesepollmanifestsinitpp">puppet/modules/epoll/manifests/init.pp</a></li> +<li><a href="#puppetmodulesepolltemplatesepollyml">puppet/modules/epoll/templates/epoll.yml</a></li> +<li><a href="#puppetmodulesmgamirrorsmanifestsinitpp">puppet/modules/mga-mirrors/manifests/init.pp</a></li> +<li><a href="#puppetmodulesmgamirrorstemplatesmgamirrorsini">puppet/modules/mga-mirrors/templates/mga-mirrors.ini</a></li> +<li><a href="#puppetmodulessympamanifestsinitpp">puppet/modules/sympa/manifests/init.pp</a></li> +<li><a href="#puppetmodulessympatemplatesauthconf">puppet/modules/sympa/templates/auth.conf</a></li> +<li><a href="#puppetmodulessympatemplatesdata_sourcesldap_groupincl">puppet/modules/sympa/templates/data_sources/ldap_group.incl</a></li> +<li><a href="#puppetmodulestransifexmanifestsinitpp">puppet/modules/transifex/manifests/init.pp</a></li> +<li><a href="#puppetmodulestransifextemplates20enginesconf">puppet/modules/transifex/templates/20-engines.conf</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesbugzillamanifestsinitpp">Modified: puppet/modules/bugzilla/manifests/init.pp</a> +=================================================================== +--- puppet/modules/bugzilla/manifests/init.pp 2010-12-15 03:11:54 UTC (rev 623) ++++ puppet/modules/bugzilla/manifests/init.pp 2010-12-15 12:24:46 UTC (rev 624) +@@ -6,8 +6,8 @@ + ensure => installed; + } + +- $password = extlookup("bugzilla_password",'x') +- $passwordLdap = extlookup("bugzilla_ldap",'x') ++ $pgsql_password = extlookup("bugzilla_pgsql",'x') ++ $ldap_password = extlookup("bugzilla_ldap",'x') + + file { '/etc/bugzilla/localconfig': + ensure => present, + +<a id="puppetmodulesbugzillatemplateslocalconfig">Modified: puppet/modules/bugzilla/templates/localconfig</a> +=================================================================== +--- puppet/modules/bugzilla/templates/localconfig 2010-12-15 03:11:54 UTC (rev 623) ++++ puppet/modules/bugzilla/templates/localconfig 2010-12-15 12:24:46 UTC (rev 624) +@@ -56,7 +56,7 @@ + # If you use apostrophe (') or a backslash (\) in your password, you'll + # need to escape it by preceding it with a '\' character. (\') or (\) + # (Far simpler just not to use those characters.) +-$db_pass = '<%= password %>'; ++$db_pass = '<%= pgsql_password %>'; + + # Sometimes the database server is running on a non-standard port. If that's + # the case for your database server, set this to the port number that your + +<a id="puppetmodulesbugzillatemplatesparams">Modified: puppet/modules/bugzilla/templates/params</a> +=================================================================== +--- puppet/modules/bugzilla/templates/params 2010-12-15 03:11:54 UTC (rev 623) ++++ puppet/modules/bugzilla/templates/params 2010-12-15 12:24:46 UTC (rev 624) +@@ -1,6 +1,6 @@ + %param = ( + 'LDAPBaseDN' => 'ou=People,<%= dc_suffix %>', +- 'LDAPbinddn' => 'cn=bugzilla-alamut,ou=System Accounts,<%= dc_suffix %>:<%= passwordLdap %>', ++ 'LDAPbinddn' => 'cn=bugzilla-alamut,ou=System Accounts,<%= dc_suffix %>:<%= ldap_password %>', + 'LDAPfilter' => '', + 'LDAPmailattribute' => 'mail', + 'LDAPserver' => 'ldap.<%= domain %>', + +<a id="puppetmodulescatdapmanifestsinitpp">Modified: puppet/modules/catdap/manifests/init.pp</a> +=================================================================== +--- puppet/modules/catdap/manifests/init.pp 2010-12-15 03:11:54 UTC (rev 623) ++++ puppet/modules/catdap/manifests/init.pp 2010-12-15 12:24:46 UTC (rev 624) +@@ -21,7 +21,7 @@ + source => "svn://svn.mageia.org/svn/soft/identity/CatDap/branches/live" + } + +- $catdap_password = extlookup('catdap_password','x') ++ $ldap_password = extlookup('catdap_ldap','x') + + file { "$catdap_location/catdap_local.yml": + ensure => present, + +<a id="puppetmodulescatdaptemplatescatdap_localyml">Modified: puppet/modules/catdap/templates/catdap_local.yml</a> +=================================================================== +--- puppet/modules/catdap/templates/catdap_local.yml 2010-12-15 03:11:54 UTC (rev 623) ++++ puppet/modules/catdap/templates/catdap_local.yml 2010-12-15 12:24:46 UTC (rev 624) +@@ -1,8 +1,6 @@ + <% + ldap_server = 'ldap.' + domain + +-ldap_password = catdap_password +- + ldap_account = 'cn=catdap-valstar,ou=System Accounts,' + dc_suffix + %> + + +<a id="puppetmodulesepollmanifestsinitpp">Modified: puppet/modules/epoll/manifests/init.pp</a> +=================================================================== +--- puppet/modules/epoll/manifests/init.pp 2010-12-15 03:11:54 UTC (rev 623) ++++ puppet/modules/epoll/manifests/init.pp 2010-12-15 12:24:46 UTC (rev 624) +@@ -14,10 +14,10 @@ + + apache::vhost_redirect_ssl { $vhost: } + +- $password = extlookup("epoll_password",'x') ++ $pgsql_password = extlookup("epoll_pgsql",'x') + + @@postgresql::user { 'epoll': +- password => $password, ++ password => $pgsql_password, + } + + + +<a id="puppetmodulesepolltemplatesepollyml">Modified: puppet/modules/epoll/templates/epoll.yml</a> +=================================================================== +--- puppet/modules/epoll/templates/epoll.yml 2010-12-15 03:11:54 UTC (rev 623) ++++ puppet/modules/epoll/templates/epoll.yml 2010-12-15 12:24:46 UTC (rev 624) +@@ -2,7 +2,7 @@ + name: Vote + # db: connection, see libpq documentation + # dbname=BASENAME;host=SERVER;user=USER;password=PASS +-db: dbname=epoll;host=localhost;user=epoll;password=<%= password %> ++db: dbname=epoll;host=localhost;user=epoll;password=<%= pgsql_password %> + # The smtp serveur to use, default is localhost + # smtp: + # This change the poll creation behavior, instead ask want confirmation by + +<a id="puppetmodulesmgamirrorsmanifestsinitpp">Modified: puppet/modules/mga-mirrors/manifests/init.pp</a> +=================================================================== +--- puppet/modules/mga-mirrors/manifests/init.pp 2010-12-15 03:11:54 UTC (rev 623) ++++ puppet/modules/mga-mirrors/manifests/init.pp 2010-12-15 12:24:46 UTC (rev 624) +@@ -11,7 +11,7 @@ + require => Package['mga-mirrors'] + } + +- $password = extlookup("mga_mirror_password",'x') ++ $pgsql_password = extlookup("mga_mirror_pgsql",'x') + + file { "mga-mirrors.ini": + path => "/etc/mga-mirrors.ini", + +<a id="puppetmodulesmgamirrorstemplatesmgamirrorsini">Modified: puppet/modules/mga-mirrors/templates/mga-mirrors.ini</a> +=================================================================== +--- puppet/modules/mga-mirrors/templates/mga-mirrors.ini 2010-12-15 03:11:54 UTC (rev 623) ++++ puppet/modules/mga-mirrors/templates/mga-mirrors.ini 2010-12-15 12:24:46 UTC (rev 624) +@@ -1,4 +1,4 @@ + [db] + pgconn=host=pgsql.<%= domain %>;dbname=mirrors + user=mirrors +-password=<%= password %> ++password=<%= pgsql_password %> + +<a id="puppetmodulessympamanifestsinitpp">Modified: puppet/modules/sympa/manifests/init.pp</a> +=================================================================== +--- puppet/modules/sympa/manifests/init.pp 2010-12-15 03:11:54 UTC (rev 623) ++++ puppet/modules/sympa/manifests/init.pp 2010-12-15 12:24:46 UTC (rev 624) +@@ -22,11 +22,11 @@ + subscribe => [ Package["sympa"], File['/etc/sympa/sympa.conf']] + } + +- $password = extlookup("sympa_password",'x') +- $ldap_passwd = extlookup("sympa_ldap",'x') ++ $pgsql_password = extlookup("sympa_pgsql",'x') ++ $ldap_password = extlookup("sympa_ldap",'x') + + @@postgresql::user { 'sympa': +- password => $password, ++ password => $pgsql_password, + } + + file { '/etc/sympa/sympa.conf': + +<a id="puppetmodulessympatemplatesauthconf">Modified: puppet/modules/sympa/templates/auth.conf</a> +=================================================================== +--- puppet/modules/sympa/templates/auth.conf 2010-12-15 03:11:54 UTC (rev 623) ++++ puppet/modules/sympa/templates/auth.conf 2010-12-15 12:24:46 UTC (rev 624) +@@ -8,7 +8,5 @@ + scope sub + use_ssl 1 + bind_dn cn=alamut-sympa,ou=System Accounts,<%= dc_suffix %> +- bind_password <%= ldap_passwd %> ++ bind_password <%= ldap_password %> + +- +- + +<a id="puppetmodulessympatemplatesdata_sourcesldap_groupincl">Modified: puppet/modules/sympa/templates/data_sources/ldap_group.incl</a> +=================================================================== +--- puppet/modules/sympa/templates/data_sources/ldap_group.incl 2010-12-15 03:11:54 UTC (rev 623) ++++ puppet/modules/sympa/templates/data_sources/ldap_group.incl 2010-12-15 12:24:46 UTC (rev 624) +@@ -2,7 +2,7 @@ + host ldap.<%= domain %> + use_ssl yes + user cn=alamut-sympa,ou=System Accounts,<%= dc_suffix %> +- passwd <%= ldap_passwd %> ++ passwd <%= ldap_password %> + suffix1 ou=Group,<%= dc_suffix %> + scope1 one + filter1 (&(objectClass=groupOfNames)(cn=<%= name %>)) + +<a id="puppetmodulestransifexmanifestsinitpp">Modified: puppet/modules/transifex/manifests/init.pp</a> +=================================================================== +--- puppet/modules/transifex/manifests/init.pp 2010-12-15 03:11:54 UTC (rev 623) ++++ puppet/modules/transifex/manifests/init.pp 2010-12-15 12:24:46 UTC (rev 624) +@@ -4,11 +4,11 @@ + ensure => installed + } + +- $password = extlookup("transifex_password",'x') ++ $pgsql_password = extlookup("transifex_pgsql",'x') + $ldap_password = extlookup("transifex_ldap",'x') + + @@postgresql::user { 'transifex': +- password => $password, ++ password => $pgsql_password, + } + + @@postgresql::database { 'transifex': + +<a id="puppetmodulestransifextemplates20enginesconf">Modified: puppet/modules/transifex/templates/20-engines.conf</a> +=================================================================== +--- puppet/modules/transifex/templates/20-engines.conf 2010-12-15 03:11:54 UTC (rev 623) ++++ puppet/modules/transifex/templates/20-engines.conf 2010-12-15 12:24:46 UTC (rev 624) +@@ -9,7 +9,7 @@ + DATABASE_NAME = 'transifex' + # The following are not used for sqlite3 + DATABASE_USER = 'transifex' +-DATABASE_PASSWORD = '<%= password %>' ++DATABASE_PASSWORD = '<%= pgsql_password %>' + DATABASE_HOST = 'pgsql.<%= domain %>' # Set to empty string for local socket + DATABASE_PORT = '' # Set to empty string for default + + +</pre></div> + +</body> +</html>
\ No newline at end of file |