confdroid/confdroid_nagios
3
0
Fork 0
Code Issues Projects Wiki Activity

OP#421 fix params

Browse Source
This commit is contained in:
12ww1160
2026-02-11 17:46:37 +01:00
parent 7803b21dd3
commit 5ea87a025a
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/main/install.pp
View File

@@ -1,7 +1,7 @@
## confdroid_nagios::main::install.pp ## confdroid_nagios::main::install.pp
# Module name: confdroid_nagios # Module name: confdroid_nagios
# Author: 12ww1160 (12ww1160@confdroid.com) # Author: 12ww1160 (12ww1160@confdroid.com)
# @summary Class manages main configuration for the confdroid_nagios module. # @summary Class manages installation matters for the confdroid_nagios module.
############################################################################### ###############################################################################
class confdroid_nagios::main::install ( class confdroid_nagios::main::install (

14
manifests/params.pp
View File

@@ -22,6 +22,12 @@ class confdroid_nagios::params (
String $ng_pkg_ensure = 'present', String $ng_pkg_ensure = 'present',
) { ) {
# Default facts
$fqdn = $facts['networking']['fqdn']
$domain = $facts['networking']['domain']
$os_name = $facts['os']['name']
$os_release = $facts['os']['release']['major']
# service # service
$ng_service = 'nagios' $ng_service = 'nagios'
$ae_service = 'httpd' $ae_service = 'httpd'
@@ -37,14 +43,6 @@ class confdroid_nagios::params (
$ng_log_archives = "${ng_log_dir}/archives" $ng_log_archives = "${ng_log_dir}/archives"
$ng_spool_dir = '/var/spool/nagios' $ng_spool_dir = '/var/spool/nagios'
) {
# Default facts
$fqdn = $facts['networking']['fqdn']
$domain = $facts['networking']['domain']
$os_name = $facts['os']['name']
$os_release = $facts['os']['release']['major']
# includes must be last # includes must be last
include confdroid_nagios::main::config include confdroid_nagios::main::config
} }