Recommit for updates in build 83
This commit is contained in:
@@ -152,6 +152,15 @@ Re-type new password:
|
|||||||
<h2 id="label-Dependencies">Dependencies</h2>
|
<h2 id="label-Dependencies">Dependencies</h2>
|
||||||
|
|
||||||
<p>All dependencies must be included in the catalogue.</p>
|
<p>All dependencies must be included in the catalogue.</p>
|
||||||
|
<ul><li>
|
||||||
|
<p><code>puppetlabs-firewall</code></p>
|
||||||
|
</li><li>
|
||||||
|
<p><code>puppetlabs-stdlib</code></p>
|
||||||
|
</li><li>
|
||||||
|
<p><code>puppetlabs-concat</code></p>
|
||||||
|
</li><li>
|
||||||
|
<p><code>puppetlabs-nagios_core</code></p>
|
||||||
|
</li></ul>
|
||||||
|
|
||||||
<h2 id="label-Deployment">Deployment</h2>
|
<h2 id="label-Deployment">Deployment</h2>
|
||||||
<ul><li>
|
<ul><li>
|
||||||
|
|||||||
@@ -152,6 +152,15 @@ Re-type new password:
|
|||||||
<h2 id="label-Dependencies">Dependencies</h2>
|
<h2 id="label-Dependencies">Dependencies</h2>
|
||||||
|
|
||||||
<p>All dependencies must be included in the catalogue.</p>
|
<p>All dependencies must be included in the catalogue.</p>
|
||||||
|
<ul><li>
|
||||||
|
<p><code>puppetlabs-firewall</code></p>
|
||||||
|
</li><li>
|
||||||
|
<p><code>puppetlabs-stdlib</code></p>
|
||||||
|
</li><li>
|
||||||
|
<p><code>puppetlabs-concat</code></p>
|
||||||
|
</li><li>
|
||||||
|
<p><code>puppetlabs-nagios_core</code></p>
|
||||||
|
</li></ul>
|
||||||
|
|
||||||
<h2 id="label-Deployment">Deployment</h2>
|
<h2 id="label-Deployment">Deployment</h2>
|
||||||
<ul><li>
|
<ul><li>
|
||||||
|
|||||||
@@ -327,7 +327,7 @@ class confdroid_nagios::nagios::objects::commands (
|
|||||||
ensure => present,
|
ensure => present,
|
||||||
command_name => 'notify-host-by-email',
|
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$',
|
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',
|
group => 'nagios',
|
||||||
mode => '0640',
|
mode => '0640',
|
||||||
target => $ng_target_command,
|
target => $ng_target_command,
|
||||||
|
|||||||
@@ -148,7 +148,7 @@ class confdroid_nagios::server::access_rules (
|
|||||||
selrole => object_r,
|
selrole => object_r,
|
||||||
seltype => nagios_etc_t,
|
seltype => nagios_etc_t,
|
||||||
seluser => system_u,
|
seluser => system_u,
|
||||||
notify => Exec['restart_httpd'],
|
notify => Exec['ng_restart_httpd'],
|
||||||
}
|
}
|
||||||
|
|
||||||
# manage file header
|
# manage file header
|
||||||
|
|||||||
@@ -139,7 +139,7 @@ class confdroid_nagios::server::service (
|
|||||||
require confdroid_nagios::nagios::resources::resource
|
require confdroid_nagios::nagios::resources::resource
|
||||||
require confdroid_nagios::nagios::objects::commands
|
require confdroid_nagios::nagios::objects::commands
|
||||||
|
|
||||||
exec { 'restart_httpd':
|
exec { 'ng_restart_httpd':
|
||||||
command => 'systemctl restart httpd',
|
command => 'systemctl restart httpd',
|
||||||
path => ['/bin', '/usr/bin', '/sbin', '/usr/sbin'],
|
path => ['/bin', '/usr/bin', '/sbin', '/usr/sbin'],
|
||||||
refreshonly => true,
|
refreshonly => true,
|
||||||
@@ -151,7 +151,7 @@ class confdroid_nagios::server::service (
|
|||||||
enable => true,
|
enable => true,
|
||||||
hasrestart => true,
|
hasrestart => true,
|
||||||
hasstatus => true,
|
hasstatus => true,
|
||||||
require => Exec['restart_httpd'],
|
require => Exec['ng_restart_httpd'],
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}</pre>
|
}</pre>
|
||||||
|
|||||||
Reference in New Issue
Block a user