Get db data directly from hiera at dovecot

diff --git a/manifests/dovecot.pp b/manifests/dovecot.pp
index c4f7b4b7c885f142757acee56b9d5d949c0a2340..3cb09b7a57b7f66dd82f7e2b303d8faee5c28854 100644 (file)
--- a/manifests/dovecot.pp
+++ b/manifests/dovecot.pp
@@ -1,4 +1,10 @@
 class mail::dovecot {
+
+  $database_user = hiera('postfixadmin_database_user', 'postfix'),
+  $database_host = hiera('postfixadmin_database_host', 'localhost'),
+  $database_name = hiera('postfixadmin_database_name', 'postfix'),
+  $database_password = hiera('postfixadmin_database_password', ''),
+
   # Dovecot
   service { "dovecot":
     ensure  => running,

diff --git a/templates/dovecot/dovecot-sql.conf.erb b/templates/dovecot/dovecot-sql.conf.erb
index 37c41e5442951f6a6e64e94de268a3808d04d255..1e93a2b3098cd051d7fe54df77681839c52f23c8 100644 (file)
--- a/templates/dovecot/dovecot-sql.conf.erb
+++ b/templates/dovecot/dovecot-sql.conf.erb
@@ -56,7 +56,7 @@ driver = mysql
 #   connect = /etc/dovecot/authdb.sqlite
 #
 #connect = dbname=virtual user=virtual
-connect = host=<%= scope.lookupvar('mail::postfixadmin::database_host') %> dbname=<%= scope.lookupvar('mail::postfixadmin::database_name') %> user=<%= scope.lookupvar('mail::postfixadmin::database_user') %> password=<%= scope.lookupvar('mail::postfixadmin::database_password') %>
+connect = host=<%= @database_host %> dbname=<%= @database_name %> user=<%= @database_user %> password=<%= @database_password %>
 
 # Default password scheme.
 #