Aliases: support for templates and custom root recipient

diff --git a/manifests/init.pp b/manifests/init.pp
index a79a524f6703fe03763962c5667b7aea2c33bfc3..c8778053fc78d59e3681a0f333f197bc1d661d50 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -30,6 +30,8 @@ class exim(
   $hide_mailname         = '',
   $mailname_in_oh        = 'true',
   $localdelivery         = 'mail_spool',
+  $root_mail_recipient   = 'root',
+  $aliases               = 'template',
 ) {
   package { "exim4":
     ensure => present,
@@ -41,11 +43,18 @@ class exim(
   }
 
   file { "/etc/aliases":
-    source => [ "puppet:///modules/site_mail/${::domain}/aliases",
-                "puppet:///modules/site_mail/${::hostname}/aliases",
-                "puppet:///modules/site_mail/aliases",
-                "puppet:///modules/mail/aliases",
-                "puppet:///modules/exim/aliases" ],
+    source => $aliases ? {
+      'source' => [ "puppet:///modules/site_mail/${::domain}/aliases",
+                    "puppet:///modules/site_mail/${::hostname}/aliases",
+                    "puppet:///modules/site_mail/aliases",
+                    "puppet:///modules/mail/aliases",
+                    "puppet:///modules/exim/aliases" ],
+      default => undef,
+    },
+    content => $aliases ? {
+      'template' => template('exim/aliases.erb'),
+      default    => undef,
+    },
     owner  => "root",
     group  => "root",
     mode   => 0644,

diff --git a/files/aliases b/templates/aliases.erb
similarity index 69%
rename from files/aliases
rename to templates/aliases.erb
index 08a0723b9a80757df34dd8d34186f6bef661b066..9fdf782ec0cbcc8f0e081968b3778db145696d58 100644 (file)
--- a/files/aliases
+++ b/templates/aliases.erb
@@ -11,4 +11,4 @@ ftp: root
 abuse: root
 noc: root
 security: root
-reprepro: root
+<% if @root_mail_recipient != 'root' -%>root: <%= @root_mail_recipient %><% end %>