aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2014-09-24 07:50:39 -0300
committerRenato Botelho <garga@FreeBSD.org>2014-09-24 07:50:39 -0300
commitd4118f763cf373e4f15be8a84fe9717d8deba637 (patch)
tree85e5034ece8fa20d5a2e7f28d1d6d20bb102f4bc
parentf542b6866de7f8c3f06a201ab98d12b3634736b4 (diff)
parent1371220c90be7195342c50a86bee13eebf1dfc7b (diff)
downloadpfsense-packages-d4118f763cf373e4f15be8a84fe9717d8deba637.tar.gz
pfsense-packages-d4118f763cf373e4f15be8a84fe9717d8deba637.tar.bz2
pfsense-packages-d4118f763cf373e4f15be8a84fe9717d8deba637.zip
Merge pull request #702 from yuki/master
-rw-r--r--config/nrpe2/nrpe2.inc9
-rw-r--r--config/nrpe2/nrpe2.xml9
-rw-r--r--pkg_config.10.xml2
-rw-r--r--pkg_config.8.xml2
-rw-r--r--pkg_config.8.xml.amd642
5 files changed, 19 insertions, 5 deletions
diff --git a/config/nrpe2/nrpe2.inc b/config/nrpe2/nrpe2.inc
index 7b249368..c515ab99 100644
--- a/config/nrpe2/nrpe2.inc
+++ b/config/nrpe2/nrpe2.inc
@@ -47,6 +47,7 @@ function nrpe2_custom_php_install_command() {
$config['installedpackages']['nrpe2']['config'][0]['server_address'] = $ip;
$config['installedpackages']['nrpe2']['config'][0]['server_port'] = 5666;
$config['installedpackages']['nrpe2']['config'][0]['allowed_hosts'] = "127.0.0.1";
+ $config['installedpackages']['nrpe2']['config'][0]['dont_blame_nrpe'] = "on";
}
if (!is_array($config['installedpackages']['nrpe2']['config'][0]['row'])) {
@@ -170,6 +171,12 @@ function nrpe2_custom_php_write_config() {
$server_port = $config['installedpackages']['nrpe2']['config'][0]['server_port'];
$allowed_hosts = $config['installedpackages']['nrpe2']['config'][0]['allowed_hosts'];
+ $dont_blame_nrpe = $config['installedpackages']['nrpe2']['config'][0]['dont_blame_nrpe'];
+ if ($config['installedpackages']['nrpe2']['config'][0]['dont_blame_nrpe'] == "on") {
+ $dont_blame_nrpe = 1;
+ } else {
+ $dont_blame_nrpe = 0;
+ }
$fd = fopen(NRPE_CONFIG_DIR . '/nrpe.cfg', 'w');
$nrpe_cfg = <<<EOD
@@ -179,7 +186,7 @@ server_port={$server_port}
nrpe_user=nagios
nrpe_group=nagios
allowed_hosts={$allowed_hosts}
-dont_blame_nrpe=0
+dont_blame_nrpe={$dont_blame_nrpe}
debug=0
command_timeout=60
connection_timeout=300
diff --git a/config/nrpe2/nrpe2.xml b/config/nrpe2/nrpe2.xml
index fec09d06..8d6f0b09 100644
--- a/config/nrpe2/nrpe2.xml
+++ b/config/nrpe2/nrpe2.xml
@@ -63,6 +63,13 @@
<required/>
</field>
<field>
+ <fielddescr>Allow Arguments (dont_blame_nrpe)</fielddescr>
+ <fieldname>dont_blame_nrpe</fieldname>
+ <description>Check this to enable accept NRPE arguments (Default: 0)</description>
+ <type>checkbox</type>
+ </field>
+
+ <field>
<type>listtopic</type>
<name>Commands</name>
<fieldname>temp</fieldname>
@@ -109,7 +116,7 @@
<required/>
</rowhelperfield>
<rowhelperfield>
- <fielddescr>Extra Options</fielddescr>
+ <fielddescr>Extra Options (Example: -s Z \$ARG1\$ \$ARG2\$)</fielddescr>
<fieldname>extra</fieldname>
<description>Warning! Use at your own risk, incorrect settings here may prevent NRPE from starting!</description>
<type>input</type>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 37bbcb57..84560923 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1176,7 +1176,7 @@
</build_pbi>
<build_options>nrpe_SET_FORCE=SSL;nrpe_UNSET_FORCE=ARGS</build_options>
<config_file>https://packages.pfsense.org/packages/config/nrpe2/nrpe2.xml</config_file>
- <version>2.15_3 v2.2</version>
+ <version>2.15_4 v2.2</version>
<status>Beta</status>
<required_version>2.2</required_version>
<maintainer>erik@erikkristensen.com</maintainer>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 25e91ce7..32c0f3ad 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1592,7 +1592,7 @@
</build_pbi>
<build_options>nrpe_SET=SSL;nrpe_UNSET_FORCE=ARGS</build_options>
<config_file>https://packages.pfsense.org/packages/config/nrpe2/nrpe2.xml</config_file>
- <version>2.12_3 v2.2</version>
+ <version>2.12_4 v2.2</version>
<status>Beta</status>
<required_version>1.2</required_version>
<maintainer>erik@erikkristensen.com</maintainer>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 90a216b1..31891c03 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1579,7 +1579,7 @@
</build_pbi>
<build_options>nrpe_SET=SSL;nrpe_UNSET_FORCE=ARGS</build_options>
<config_file>https://packages.pfsense.org/packages/config/nrpe2/nrpe2.xml</config_file>
- <version>2.12_3 v2.2</version>
+ <version>2.12_4 v2.2</version>
<status>Beta</status>
<required_version>1.2</required_version>
<maintainer>erik@erikkristensen.com</maintainer>