From 7e5b0998aa9eebbcf6992944cbdd1af623029ab1 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Mon, 22 Apr 2013 21:19:03 +0100 Subject: [PATCH] add mailrelay role Signed-off-by: Stephen Gran --- modules/exim/files/admin.debian.org/aliases | 26 +++++++++++++++++++++ modules/roles/manifests/init.pp | 5 ++++ modules/roles/manifests/mailrelay.pp | 8 +++++++ 3 files changed, 39 insertions(+) create mode 100644 modules/exim/files/admin.debian.org/aliases create mode 100644 modules/roles/manifests/mailrelay.pp diff --git a/modules/exim/files/admin.debian.org/aliases b/modules/exim/files/admin.debian.org/aliases new file mode 100644 index 00000000..d11e2dfc --- /dev/null +++ b/modules/exim/files/admin.debian.org/aliases @@ -0,0 +1,26 @@ +# rfc2142: + +abuse: root +noc: root +security: root +postmaster: root +hostmaster: root +webmaster: root +www: root +ftp: root + +# and root: +root: debian-admin@debian.org + +# Others + +nagios: debianadmin@palfrader.org, debian-admin@ftbfs.de +bacula-reports: debian-archive-debian-admin-bacula@master.debian.org,debianadmin@palfrader.org,lfilipoz@emyr.net,zobel@debian.org + +# CVS logs for http://db.debian.org/*.html +db-web-cvs: debian-admin@debian.org + +# CVS logs for userdir-ldap +# well, now bzr logs of all the stuff on samosa +# Well, now, really git (mostly) +udcvs-commits: debian-archive-debian-admin-udcvs-commits@master.debian.org, debianadmin@palfrader.org, dsa-bzr@commit.noreply.org, debian-admin@ftbfs.de, steve@lobefin.net, paravoid@debian.org, tfheen@debian.org diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp index a4a6cf08..fad6b087 100644 --- a/modules/roles/manifests/init.pp +++ b/modules/roles/manifests/init.pp @@ -75,6 +75,11 @@ class roles { if getfromhash($site::nodeinfo, 'weblog_provider') { include roles::weblog_provider } + + if getfromhash($site::nodeinfo, 'mailrelay') { + include roles::mailrelay + } + if $::hostname in [ravel] { include roles::weblog_destination } diff --git a/modules/roles/manifests/mailrelay.pp b/modules/roles/manifests/mailrelay.pp new file mode 100644 index 00000000..c6abab28 --- /dev/null +++ b/modules/roles/manifests/mailrelay.pp @@ -0,0 +1,8 @@ +class roles::mailrelay { + exim::vdomain { 'admin.debian.org': + user => mail_admin, + group => mail_admin, + maildir => '/org/admin.debian.org/mail/', + alias_file => 'puppet:///modules/exim/admin.debian.org/aliases' + } +} -- 2.39.2