[Mageia-sysadm] [624] uniformisation of the name of variable used for password, so we know if this is ldap or postgresql at the first glance

root at mageia.org root at mageia.org
Wed Dec 15 13:24:46 CET 2010


Revision: 624
Author:   misc
Date:     2010-12-15 13:24:46 +0100 (Wed, 15 Dec 2010)
Log Message:
-----------
uniformisation of the name of variable used for password, so we know if this is ldap or postgresql at the first glance

Modified Paths:
--------------
    puppet/modules/bugzilla/manifests/init.pp
    puppet/modules/bugzilla/templates/localconfig
    puppet/modules/bugzilla/templates/params
    puppet/modules/catdap/manifests/init.pp
    puppet/modules/catdap/templates/catdap_local.yml
    puppet/modules/epoll/manifests/init.pp
    puppet/modules/epoll/templates/epoll.yml
    puppet/modules/mga-mirrors/manifests/init.pp
    puppet/modules/mga-mirrors/templates/mga-mirrors.ini
    puppet/modules/sympa/manifests/init.pp
    puppet/modules/sympa/templates/auth.conf
    puppet/modules/sympa/templates/data_sources/ldap_group.incl
    puppet/modules/transifex/manifests/init.pp
    puppet/modules/transifex/templates/20-engines.conf

Modified: puppet/modules/bugzilla/manifests/init.pp
===================================================================
--- 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,

Modified: puppet/modules/bugzilla/templates/localconfig
===================================================================
--- 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

Modified: puppet/modules/bugzilla/templates/params
===================================================================
--- 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 %>',

Modified: puppet/modules/catdap/manifests/init.pp
===================================================================
--- 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,

Modified: puppet/modules/catdap/templates/catdap_local.yml
===================================================================
--- 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
 %>
 

Modified: puppet/modules/epoll/manifests/init.pp
===================================================================
--- 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,
     }
 
  

Modified: puppet/modules/epoll/templates/epoll.yml
===================================================================
--- 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

Modified: puppet/modules/mga-mirrors/manifests/init.pp
===================================================================
--- 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",    

Modified: puppet/modules/mga-mirrors/templates/mga-mirrors.ini
===================================================================
--- 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 %>

Modified: puppet/modules/sympa/manifests/init.pp
===================================================================
--- 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':

Modified: puppet/modules/sympa/templates/auth.conf
===================================================================
--- 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 %>
 
-
-

Modified: puppet/modules/sympa/templates/data_sources/ldap_group.incl
===================================================================
--- 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 %>))

Modified: puppet/modules/transifex/manifests/init.pp
===================================================================
--- 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':

Modified: puppet/modules/transifex/templates/20-engines.conf
===================================================================
--- 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
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20101215/e57eaef8/attachment-0001.html>


More information about the Mageia-sysadm mailing list