From f4cb7198b36421119a4598908e78341e624f6a1b Mon Sep 17 00:00:00 2001 From: 12ww1160 <12ww1160@confdroid.com> Date: Tue, 10 Mar 2026 12:21:04 +0100 Subject: [PATCH] make contact changeable --- manifests/monitoring/target.pp | 2 +- manifests/params.pp | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/manifests/monitoring/target.pp b/manifests/monitoring/target.pp index 5bef526..7fa53d9 100644 --- a/manifests/monitoring/target.pp +++ b/manifests/monitoring/target.pp @@ -17,7 +17,7 @@ class confdroid_apache::monitoring::target ( owner => 'nagios', group => 'nagios', mode => '0640', - contacts => 'ops', + contacts => $ae_target_contacts, } } } diff --git a/manifests/params.pp b/manifests/params.pp index 0902c2a..69cdef6 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -40,14 +40,15 @@ # @param [String] ae_http_port the port to use for the http protocol # @param [String] ae_https_port the port to use for the https protocol # @param [String] ae_target_service which service to monitor with nagios +# @param [String] ae_target_contacts which contacts to notify for nagios alerts # @param [Boolean] ae_manage_fw whether to manage firewall settings # @param [Array] reqpackages List of packages to install. ########################################################################### class confdroid_apache::params ( # installation - String $pkg_ensure = 'present', - Array $reqpackages = ['httpd','mod_ssl'], + String $pkg_ensure = 'present', + Array $reqpackages = ['httpd','mod_ssl'], # configuration files Boolean $ae_manage_cfg = false, @@ -56,13 +57,14 @@ class confdroid_apache::params ( # nagios Boolean $ae_incl_target = false, - String $ae_target_service = '/etc/nagios/conf.d/httpd_service.cfg', + String $ae_target_service = '/etc/nagios/conf.d/httpd_service.cfg', + String $ae_target_contacts = 'nagiosadmin', # firewall Boolean $ae_manage_fw = true, - String $ae_order_no = '50', - String $ae_http_port = '80', - String $ae_https_port = '443', + String $ae_order_no = '50', + String $ae_http_port = '80', + String $ae_https_port = '443', ) { # facts