Moving dovecot.conf to a template

diff --git a/manifests/dovecot.pp b/manifests/dovecot.pp
index 0ced8e15e85f5148d85b97899d1b42b5d9179261..20364fe83f965f8b37ed23fe7edb2a50725b939a 100644 (file)
--- a/manifests/dovecot.pp
+++ b/manifests/dovecot.pp
@@ -6,12 +6,12 @@ class mail::dovecot {
   }
 
   file { "/etc/dovecot/dovecot.conf":
-    ensure => present,
-    owner  => root,
-    group  => vmail,
-    mode   => 0644,
-    source => "puppet://$server/modules/mail/dovecot/dovecot.conf",
-    notify => Service['dovecot'],
+    ensure  => present,
+    owner   => root,
+    group   => vmail,
+    mode    => 0644,
+    content => template('mail/dovecot/dovecot.conf.erb'),
+    notify  => Service['dovecot'],
   }
 
   file { "/etc/dovecot/dovecot-sql.conf":

diff --git a/files/dovecot/dovecot.conf b/templates/dovecot/dovecot.conf.erb
similarity index 99%
rename from files/dovecot/dovecot.conf
rename to templates/dovecot/dovecot.conf.erb
index 19750bfabd2f470c887ee318626536ec228b55e9..0da5182a0713733e00da29ff08d198e98a84d0b6 100644 (file)
--- a/files/dovecot/dovecot.conf
+++ b/templates/dovecot/dovecot.conf.erb
@@ -709,7 +709,7 @@ protocol managesieve {
 
 protocol lda {
   # Address to use when sending rejection mails.
-  # postmaster_address = postmaster@example.com
+  postmaster_address = postmaster@<%= fqdn %>
 
   # Hostname to use in various parts of sent mails, eg. in Message-Id.
   # Default is the system's real hostname.