From 0426f5e47f64c2c502815836a6a734f7c2e299de Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 14 Oct 2016 17:50:04 -0300
Subject: Aliases: support for templates and custom root recipient

---
 files/aliases         | 14 --------------
 manifests/init.pp     | 19 ++++++++++++++-----
 templates/aliases.erb | 14 ++++++++++++++
 3 files changed, 28 insertions(+), 19 deletions(-)
 delete mode 100644 files/aliases
 create mode 100644 templates/aliases.erb

diff --git a/files/aliases b/files/aliases
deleted file mode 100644
index 08a0723..0000000
--- a/files/aliases
+++ /dev/null
@@ -1,14 +0,0 @@
-# /etc/aliases
-mailer-daemon: postmaster
-postmaster: root
-nobody: root
-hostmaster: root
-usenet: root
-news: root
-webmaster: root
-www: root
-ftp: root
-abuse: root
-noc: root
-security: root
-reprepro: root
diff --git a/manifests/init.pp b/manifests/init.pp
index a79a524..c877805 100644
--- 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/templates/aliases.erb b/templates/aliases.erb
new file mode 100644
index 0000000..9fdf782
--- /dev/null
+++ b/templates/aliases.erb
@@ -0,0 +1,14 @@
+# /etc/aliases
+mailer-daemon: postmaster
+postmaster: root
+nobody: root
+hostmaster: root
+usenet: root
+news: root
+webmaster: root
+www: root
+ftp: root
+abuse: root
+noc: root
+security: root
+<% if @root_mail_recipient != 'root' -%>root: <%= @root_mail_recipient %><% end %>
-- 
cgit v1.2.3