From 47905966a7700c18860062ab0031f7139d05a09d Mon Sep 17 00:00:00 2001 From: 12ww1160 <12ww1160@confdroid.com> Date: Sat, 21 Feb 2026 13:44:41 +0100 Subject: [PATCH] OP#436 add main file control --- README.md | 1 + manifests/params.pp | 5 +++++ manifests/server/files.pp | 20 ++++++++++---------- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 2e868b3..8176027 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,7 @@ At this stage, the module is being redeveloped and being built to the latest sta - an additional directory /etc/nagios/conf.d is created to place the custom checks etc. without being overwritten by updates. - if `ng_include_nrpe`is set to `true`, the confdroid_nrpe module is automatically applied on clients ([confdroid_nrpe](https://sourcecode.confdroid.com/confdroid/confdroid_nrpe) must be in the catalogue then) +- configures all required directories for server and clients and sets proper permissions and selinux contexts ### configuring user access ToDo diff --git a/manifests/params.pp b/manifests/params.pp index f2a3f3a..2bf611b 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -23,6 +23,8 @@ # @param [String] ng_main_password The encrypted password for the Nagios web # interface. Default is 'nagios'. Must be properly encrypted using the # htpasswd utility. +# @param [String] ng_context_help Whether to enable the context help in the +# Nagios web interface. Default is '1'. ############################################################################### class confdroid_nagios::params ( @@ -35,6 +37,9 @@ class confdroid_nagios::params ( String $ng_main_user = 'nagios', String $ng_main_password = 'nagios', +# cgi + String $ng_context_help = '1', + # httpd Boolean $ng_use_https = false, diff --git a/manifests/server/files.pp b/manifests/server/files.pp index 3fcc493..5e605c3 100644 --- a/manifests/server/files.pp +++ b/manifests/server/files.pp @@ -7,14 +7,14 @@ class confdroid_nagios::server::files ( ) inherits confdroid_nagios::params { require confdroid_nagios::main::dirs -# if $ng_nagios_server == $fqdn { -# file { $ng_nagios_cfg_file: -# ensure => file, -# owner => 'nagios', -# group => 'nagios', -# mode => '0644', -# content => template($ng_nagios_cfg_erb), -# notify => Service[$ng_nagios_service], -# } -# } + if $ng_nagios_server == $fqdn { + file { $ng_nagios_cfg_file: + ensure => file, + owner => 'nagios', + group => 'nagios', + mode => '0644', + content => template($ng_nagios_cfg_erb), + notify => Service[$ng_nagios_service], + } + } }