From 387aca4f3d4660c2811cc11cc2ab5b709d6c5154 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Thu, 21 Sep 2017 15:00:13 +0200 Subject: [PATCH] Move samhain_recipients to hiera --- hieradata/common.yaml | 6 ++++++ modules/debian_org/manifests/init.pp | 10 ++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 3201ad525..c3af400c6 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -7,6 +7,12 @@ role_config__mirrors: mirror_basedir_prefix: '/srv/mirrors/' role_config__syncproxy: mirror_basedir_prefix: '/srv/mirrors/' +samhain_recipients: + - 'debian-archive-debian-samhain-reports@master.debian.org', + - 'debian-admin@ftbfs.de', + - 'weasel@debian.org', + - 'steve@lobefin.net', + - 'zumbi@oron.es' roles: bugsmx: - buxtehude.debian.org diff --git a/modules/debian_org/manifests/init.pp b/modules/debian_org/manifests/init.pp index 71e832914..af8f8bbf6 100644 --- a/modules/debian_org/manifests/init.pp +++ b/modules/debian_org/manifests/init.pp @@ -19,13 +19,7 @@ class debian_org { package { 'virt-what': ensure => purged } } - $debianadmin = [ - 'debian-archive-debian-samhain-reports@master.debian.org', - 'debian-admin@ftbfs.de', - 'weasel@debian.org', - 'steve@lobefin.net', - 'zumbi@oron.es' - ] + $samhain_recipients = hiera('samhain_recipients') package { [ 'klogd', @@ -250,7 +244,7 @@ class debian_org { } mailalias { 'samhain-reports': ensure => present, - recipient => $debianadmin, + recipient => $samhain_recipients, require => Package['debian.org'] } -- 2.20.1