uniformisation of the name of variable used for password, so we know if this is ldap or postgresql at the first glance

14 files changed, 18 insertions, 22 deletions

diff --git a/modules/bugzilla/manifests/init.pp b/modules/bugzilla/manifests/init.pp
index 8c4553ce..c1388ce7 100644
--- a/modules/bugzilla/manifests/init.pp
+++ b/modules/bugzilla/manifests/init.pp
@@ -6,8 +6,8 @@ class bugzilla {
         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,
diff --git a/modules/bugzilla/templates/localconfig b/modules/bugzilla/templates/localconfig
index 23089510..5ef4a9ab 100644
--- a/modules/bugzilla/templates/localconfig
+++ b/modules/bugzilla/templates/localconfig
@@ -56,7 +56,7 @@ $db_user = 'bugs';
 # 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
diff --git a/modules/bugzilla/templates/params b/modules/bugzilla/templates/params
index df5c98a2..45e8a0c8 100644
--- a/modules/bugzilla/templates/params
+++ b/modules/bugzilla/templates/params
@@ -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 %>',
diff --git a/modules/catdap/manifests/init.pp b/modules/catdap/manifests/init.pp
index 01709618..634a9d7f 100644
--- a/modules/catdap/manifests/init.pp
+++ b/modules/catdap/manifests/init.pp
@@ -21,7 +21,7 @@ class catdap {
         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,
diff --git a/modules/catdap/templates/catdap_local.yml b/modules/catdap/templates/catdap_local.yml
index 50f43601..c134ee22 100644
--- a/modules/catdap/templates/catdap_local.yml
+++ b/modules/catdap/templates/catdap_local.yml
@@ -1,8 +1,6 @@
 <%
 ldap_server = 'ldap.' + domain
 
-ldap_password = catdap_password
-
 ldap_account = 'cn=catdap-valstar,ou=System Accounts,' + dc_suffix
 %>
 
diff --git a/modules/epoll/manifests/init.pp b/modules/epoll/manifests/init.pp
index e32990c9..89a2ce4c 100644
--- a/modules/epoll/manifests/init.pp
+++ b/modules/epoll/manifests/init.pp
@@ -14,10 +14,10 @@ class epoll {
 
     apache::vhost_redirect_ssl { $vhost: }
      
-    $password = extlookup("epoll_password",'x')
+    $pgsql_password = extlookup("epoll_pgsql",'x')
 
     @@postgresql::user { 'epoll':
-        password => $password,
+        password => $pgsql_password,
     }
 
  
diff --git a/modules/epoll/templates/epoll.yml b/modules/epoll/templates/epoll.yml
index 74e44efd..0ca519c9 100644
--- a/modules/epoll/templates/epoll.yml
+++ b/modules/epoll/templates/epoll.yml
@@ -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
diff --git a/modules/mga-mirrors/manifests/init.pp b/modules/mga-mirrors/manifests/init.pp
index 2b7def29..b41ed53c 100644
--- a/modules/mga-mirrors/manifests/init.pp
+++ b/modules/mga-mirrors/manifests/init.pp
@@ -11,7 +11,7 @@ class mga-mirrors {
         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",    
diff --git a/modules/mga-mirrors/templates/mga-mirrors.ini b/modules/mga-mirrors/templates/mga-mirrors.ini
index 973c65fd..ce7ee911 100644
--- a/modules/mga-mirrors/templates/mga-mirrors.ini
+++ b/modules/mga-mirrors/templates/mga-mirrors.ini
@@ -1,4 +1,4 @@
 [db]
 pgconn=host=pgsql.<%= domain %>;dbname=mirrors
 user=mirrors
-password=<%= password %>
+password=<%= pgsql_password %>
diff --git a/modules/sympa/manifests/init.pp b/modules/sympa/manifests/init.pp
index 97593141..09c57a36 100644
--- a/modules/sympa/manifests/init.pp
+++ b/modules/sympa/manifests/init.pp
@@ -22,11 +22,11 @@ class sympa {
             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':
diff --git a/modules/sympa/templates/auth.conf b/modules/sympa/templates/auth.conf
index f84c519f..93eade85 100644
--- a/modules/sympa/templates/auth.conf
+++ b/modules/sympa/templates/auth.conf
@@ -8,7 +8,5 @@ ldap
         scope                           sub
         use_ssl                         1
         bind_dn                         cn=alamut-sympa,ou=System Accounts,<%= dc_suffix %>
-        bind_password                   <%= ldap_passwd %>
-
-
+        bind_password                   <%= ldap_password %>
 
diff --git a/modules/sympa/templates/data_sources/ldap_group.incl b/modules/sympa/templates/data_sources/ldap_group.incl
index a320ef0d..2676ae3c 100644
--- a/modules/sympa/templates/data_sources/ldap_group.incl
+++ b/modules/sympa/templates/data_sources/ldap_group.incl
@@ -2,7 +2,7 @@ include_ldap_2level_query
         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 %>))
diff --git a/modules/transifex/manifests/init.pp b/modules/transifex/manifests/init.pp
index c0331958..844b7306 100644
--- a/modules/transifex/manifests/init.pp
+++ b/modules/transifex/manifests/init.pp
@@ -4,11 +4,11 @@ class transifex {
     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':
diff --git a/modules/transifex/templates/20-engines.conf b/modules/transifex/templates/20-engines.conf
index 1906a438..13eb0334 100644
--- a/modules/transifex/templates/20-engines.conf
+++ b/modules/transifex/templates/20-engines.conf
@@ -9,7 +9,7 @@ DATABASE_ENGINE = 'postgresql_psycopg2'
 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