X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fbacula%2Fmanifests%2Finit.pp;h=02cf50615db485740b8fa8c3537d89ef0cc87933;hb=778db5721899bfcab35141f8376989a2ae08f320;hp=1b88a49cecb9390453f694214a5eb2cbfb03f5cb;hpb=63016bb3a6b7266c022f7d7e2398a0360d476fd5;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/init.pp b/modules/bacula/manifests/init.pp
index 1b88a49ce..02cf50615 100644
--- a/modules/bacula/manifests/init.pp
+++ b/modules/bacula/manifests/init.pp
@@ -1,26 +1,32 @@
 # bacula class -- defines all the variables we care about in our bacula deployment
 #
-# @param operator_email   email address for reports
 # @param ssl_ca_path      full path and filename specifying a PEM encoded TLS CA certificate(s)
 # @param ssl_client_cert  path to TLS client certificate
 # @param ssl_client_key   path to TLS client certificate key
 # @param ssl_server_cert  path to TLS server certificate
 # @param ssl_server_key   path to TLS server certificate key
+# @param email_all        email address for all reports
+# @param email_error      email address for errors
+# @param email_operator   email address for the operator (to mount tapes etc)
+# @param email_daemon     email address for messages from the daemon
 # @param public_addresses this host's public IP addresses.  The ones it connects out from and is reachable from outsite.
 # @param has_ipv4         daemons should listen on ipv4
 # @param has_ipv6         daemons should listen on ipv6
 class bacula (
-  String  $operator_email          = 'root@localhost',
   String $ssl_ca_path,
   String $ssl_client_cert,
   String $ssl_client_key,
   String $ssl_server_cert,
   String $ssl_server_key,
 
+  Optional[String] $email_all = undef,
+  # default to all if defined, otherwise default to 'root' to enforce error delivery
+  String $email_error                          = $email_all ? { undef => 'root', default => $email_all },
+  String $email_operator                       = $email_error,
+  String $email_daemon                         = $email_error,
   Array[Stdlib::IP::Address] $public_addresses = $base::public_addresses,
-
-  Boolean $has_ipv4        = $bacula::public_addresses.any |$addr| { $addr =~ Stdlib::IP::Address::V4 },
-  Boolean $has_ipv6        = $bacula::public_addresses.any |$addr| { $addr =~ Stdlib::IP::Address::V6 },
+  Boolean $has_ipv4                            = $bacula::public_addresses.any |$addr| { $addr =~ Stdlib::IP::Address::V4 },
+  Boolean $has_ipv6                            = $bacula::public_addresses.any |$addr| { $addr =~ Stdlib::IP::Address::V6 },
 ) {
   # This file is used by our helper scripts on the director
   $bacula_dsa_client_list     = '/etc/bacula/dsa-clients'