Recommit for updates in build 83

This commit is contained in:
Jenkins Server
2026-03-01 14:22:56 +01:00
parent 1f5c606517
commit 64b6940bab
5 changed files with 22 additions and 4 deletions

View File

@@ -327,7 +327,7 @@ class confdroid_nagios::nagios::objects::commands (
ensure => present,
command_name => 'notify-host-by-email',
command_line => '/usr/bin/printf "%b" "***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTADDRESS$\nState: $HOSTSTATE$\nAddress: $HOSTADDRESS$\nInfo: $HOSTOUTPUT$\n\nDate/Time: $LONGDATETIME$\n" | /bin/mail -s "** $NOTIFICATIONTYPE$ Host Alert: $HOSTADDRESS$ is $HOSTSTATE$ **" $CONTACTEMAIL$',
owner => 'nagios',
owner => 'nagions',
group => 'nagios',
mode => '0640',
target => $ng_target_command,

View File

@@ -148,7 +148,7 @@ class confdroid_nagios::server::access_rules (
selrole => object_r,
seltype => nagios_etc_t,
seluser => system_u,
notify => Exec['restart_httpd'],
notify => Exec['ng_restart_httpd'],
}
# manage file header

View File

@@ -139,7 +139,7 @@ class confdroid_nagios::server::service (
require confdroid_nagios::nagios::resources::resource
require confdroid_nagios::nagios::objects::commands
exec { 'restart_httpd':
exec { 'ng_restart_httpd':
command => 'systemctl restart httpd',
path => ['/bin', '/usr/bin', '/sbin', '/usr/sbin'],
refreshonly => true,
@@ -151,7 +151,7 @@ class confdroid_nagios::server::service (
enable => true,
hasrestart => true,
hasstatus => true,
require => Exec['restart_httpd'],
require => Exec['ng_restart_httpd'],
}
}
}</pre>