diff options
-rwxr-xr-x | manifests/nodes/sucuk.pp | 1 | ||||
-rw-r--r-- | modules/epoll/manifests/var.pp | 7 | ||||
-rw-r--r-- | modules/epoll/templates/epoll.yml | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/manifests/nodes/sucuk.pp b/manifests/nodes/sucuk.pp index 5d1c8493..7067714c 100755 --- a/manifests/nodes/sucuk.pp +++ b/manifests/nodes/sucuk.pp @@ -11,6 +11,7 @@ node sucuk { class {'epoll::var': db_password => extlookup('epoll_pgsql','x'), + password => extlookup('epoll_password','x'), } include epoll diff --git a/modules/epoll/manifests/var.pp b/modules/epoll/manifests/var.pp index e99239ce..1ddc342a 100644 --- a/modules/epoll/manifests/var.pp +++ b/modules/epoll/manifests/var.pp @@ -19,12 +19,17 @@ # [*db_password*] # password to connect to the database # +# [*password*] +# password to create new polls +# + class epoll::var ( $vhost = "epoll.${::domain}", $db_hostname = 'localhost', $db_name = 'epoll', $db_user = 'epoll', - $db_password + $db_password, + $password ) { } # vim: sw=2 diff --git a/modules/epoll/templates/epoll.yml b/modules/epoll/templates/epoll.yml index a6d078ff..d442a41e 100644 --- a/modules/epoll/templates/epoll.yml +++ b/modules/epoll/templates/epoll.yml @@ -8,4 +8,4 @@ db: dbname=<%= scope.lookupvar('epoll::var::db_name') %>;host=<%= scope.lookupva # This change the poll creation behavior, instead ask want confirmation by # mail # it ask for this password (in clear) -# newpollpasswd: +newpollpasswd: <%= scope.lookupvar('epoll::var::password') %> |