Recommit for updates in build 19
This commit is contained in:
@@ -111,12 +111,7 @@
|
|||||||
16
|
16
|
||||||
17
|
17
|
||||||
18
|
18
|
||||||
19
|
19</pre>
|
||||||
20
|
|
||||||
21
|
|
||||||
22
|
|
||||||
23
|
|
||||||
24</pre>
|
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<pre class="code"><span class="info file"># File 'manifests/firewall/iptables.pp', line 7</span>
|
<pre class="code"><span class="info file"># File 'manifests/firewall/iptables.pp', line 7</span>
|
||||||
@@ -124,15 +119,10 @@
|
|||||||
class confdroid_nrpe::firewall::iptables (
|
class confdroid_nrpe::firewall::iptables (
|
||||||
|
|
||||||
) inherits confdroid_nrpe::params {
|
) inherits confdroid_nrpe::params {
|
||||||
$nagios_source = $::nagios_source
|
|
||||||
$nagios_server = $::nagios_server
|
|
||||||
|
|
||||||
if $ne_incl_fw == true {
|
if $ne_incl_fw == true {
|
||||||
notify { "nagios_source is set to ${nagios_source}": }
|
|
||||||
notify { "nagios_server is set to ${nagios_server}": }
|
|
||||||
|
|
||||||
firewall { "${ne_fw_order_no}${ne_nrpe_port} port ${ne_nrpe_port}":
|
firewall { "${ne_fw_order_no}${ne_nrpe_port} port ${ne_nrpe_port}":
|
||||||
source => $nagios_source,
|
source => $nagios_server,
|
||||||
proto => 'tcp',
|
proto => 'tcp',
|
||||||
dport => $ne_nrpe_port,
|
dport => $ne_nrpe_port,
|
||||||
jump => 'accept',
|
jump => 'accept',
|
||||||
|
|||||||
@@ -910,8 +910,8 @@ class confdroid_nrpe::params (
|
|||||||
$domain = $facts['networking']['domain']
|
$domain = $facts['networking']['domain']
|
||||||
$os_name = $facts['os']['name']
|
$os_name = $facts['os']['name']
|
||||||
$os_release = $facts['os']['release']['major']
|
$os_release = $facts['os']['release']['major']
|
||||||
$nagios_server = $facts['nagios_server']
|
$nagios_server = $::nagios_server
|
||||||
$nagios_source = $facts['nagios_source']
|
$nagios_source = $::nagios_source
|
||||||
|
|
||||||
# service
|
# service
|
||||||
$ne_service = 'nrpe'
|
$ne_service = 'nrpe'
|
||||||
|
|||||||
Reference in New Issue
Block a user