More places to look for aliases

diff --git a/files/aliases b/files/aliases
new file mode 100644 (file)
index 0000000..08a0723
--- /dev/null
+++ b/files/aliases
@@ -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
+reprepro: root

diff --git a/manifests/init.pp b/manifests/init.pp
index b00aa375de57a3eee8907948092d6b4c4b2c4cb1..a79a524f6703fe03763962c5667b7aea2c33bfc3 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -43,7 +43,9 @@ 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/site_mail/aliases",
+                "puppet:///modules/mail/aliases",
+                "puppet:///modules/exim/aliases" ],
     owner  => "root",
     group  => "root",
     mode   => 0644,