From 75e79d222aeaa7be5c774a4218655c4ba2ffe6ab Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Wed, 15 Dec 2010 12:24:46 +0000 Subject: uniformisation of the name of variable used for password, so we know if this is ldap or postgresql at the first glance --- modules/epoll/manifests/init.pp | 4 ++-- modules/epoll/templates/epoll.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/epoll') 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 -- cgit v1.2.1