From 11171ea0c3a1268f924f6cc49fd013d4a3262a2c Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Wed, 25 Sep 2019 19:01:35 +0200 Subject: [PATCH] Fix bacula email logic --- data/common.yaml | 1 - modules/bacula/manifests/init.pp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/data/common.yaml b/data/common.yaml index a4c5ac67b..06f0d036d 100644 --- a/data/common.yaml +++ b/data/common.yaml @@ -33,7 +33,6 @@ roles::dns_primary::allow_access: # bacula # bacula::email_all: 'bacula-reports@admin.debian.org' -bacula::email_error: 'bacula-reports@admin.debian.org' bacula::ssl_ca_path: '/etc/ssl/debian/certs/ca.crt' bacula::ssl_client_cert: '/etc/ssl/debian/certs/thishost.crt' bacula::ssl_client_key: '/etc/ssl/private/thishost.key' diff --git a/modules/bacula/manifests/init.pp b/modules/bacula/manifests/init.pp index 90e42af87..cf83a2689 100644 --- a/modules/bacula/manifests/init.pp +++ b/modules/bacula/manifests/init.pp @@ -20,7 +20,7 @@ class bacula ( String $ssl_server_key, Optional[String] $email_all = undef, - String $email_error = $email_all ? { true => $email_all, default => 'root@localhost' }, + String $email_error = $email_all != undef ? { true => $email_all, default => 'root@localhost' }, String $email_operator = $email_error, String $email_daemon = $email_error, Array[Stdlib::IP::Address] $public_addresses = $base::public_addresses, -- 2.20.1