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/epoll | |
| 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/epoll')
| -rw-r--r-- | modules/epoll/manifests/init.pp | 4 | ||||
| -rw-r--r-- | modules/epoll/templates/epoll.yml | 2 |
2 files changed, 3 insertions, 3 deletions
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 |