From: Stephen Gran Date: Tue, 21 Jun 2011 19:48:45 +0000 (+0100) Subject: Revert "oh, I give up" X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=934d81fffd8fa3b71328abc5cada5aa953dd183e;hp=6feca253cf930c28f41d286937e4e45c1ad19845;p=dsa-puppet.git Revert "oh, I give up" This reverts commit 6feca253cf930c28f41d286937e4e45c1ad19845. --- diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp index 49d81c21..fca4976e 100644 --- a/modules/debian-org/manifests/init.pp +++ b/modules/debian-org/manifests/init.pp @@ -39,7 +39,7 @@ define linux_module ($ensure) { class debian-org { - + $debianadmin = debian-archive-debian-samhain-reports@master.debian.org,debian-admin@ftbfs.de,weasel@debian.org,steve@lobefin.net package { "apt-utils": ensure => installed; "bash-completion": ensure => installed; @@ -127,6 +127,12 @@ class debian-org { linkto => "/usr/bin/vim.basic", } + mailalias { + "samhain-reports": + recipient => $debianadmin, + ensure => present; + } + exec { "dpkg-reconfigure tzdata -pcritical -fnoninteractive": path => "/usr/bin:/usr/sbin:/bin:/sbin",