diff options
| author | Michael Scherer <misc@mageia.org> | 2010-12-15 12:24:46 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2010-12-15 12:24:46 +0000 |
| commit | 75e79d222aeaa7be5c774a4218655c4ba2ffe6ab (patch) | |
| tree | b45e7c5ce363bb552de16bb7bddbcefd1be070b2 /modules/transifex | |
| parent | a0d62a41b9b21e44ae561e8ec0fa4457c7cfcc2a (diff) | |
| download | puppet-75e79d222aeaa7be5c774a4218655c4ba2ffe6ab.tar puppet-75e79d222aeaa7be5c774a4218655c4ba2ffe6ab.tar.gz puppet-75e79d222aeaa7be5c774a4218655c4ba2ffe6ab.tar.bz2 puppet-75e79d222aeaa7be5c774a4218655c4ba2ffe6ab.tar.xz puppet-75e79d222aeaa7be5c774a4218655c4ba2ffe6ab.zip | |
uniformisation of the name of variable used for password, so we know if this is ldap or postgresql at the first glance
Diffstat (limited to 'modules/transifex')
| -rw-r--r-- | modules/transifex/manifests/init.pp | 4 | ||||
| -rw-r--r-- | modules/transifex/templates/20-engines.conf | 2 |
2 files changed, 3 insertions, 3 deletions
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 |