aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorErik <erik@erikkristensen.com>2010-03-31 19:42:19 -0400
committerErik <erik@erikkristensen.com>2010-03-31 19:42:19 -0400
commit56f8ea7f9c81f3650fd9173081ce981129824cbd (patch)
treeffe49c7f1ba6b9ef72d2891f9adfa45bdb6e11b5 /config
parentd3b9db41db672af5d08ad9f9bbc81ab98bacc2e8 (diff)
parent1fd19a93e04e47fda72abf7246d061221e6b173a (diff)
downloadpfsense-packages-56f8ea7f9c81f3650fd9173081ce981129824cbd.tar.gz
pfsense-packages-56f8ea7f9c81f3650fd9173081ce981129824cbd.tar.bz2
pfsense-packages-56f8ea7f9c81f3650fd9173081ce981129824cbd.zip
Merge branch 'master' of git://rcs.pfsense.org/pfsense-packages/Eugene-clone into review/master
Diffstat (limited to 'config')
-rw-r--r--config/nrpe2/nrpe2.inc4
-rw-r--r--config/nrpe2/nrpe2.xml4
2 files changed, 5 insertions, 3 deletions
diff --git a/config/nrpe2/nrpe2.inc b/config/nrpe2/nrpe2.inc
index 261f2e3b..8898bc9c 100644
--- a/config/nrpe2/nrpe2.inc
+++ b/config/nrpe2/nrpe2.inc
@@ -32,7 +32,7 @@ function nrpe2_custom_php_install_command()
$ip = $config['interfaces']['lan']['ipaddr'];
- $config['installedpackages']['nrpe2']['config'][0]['enabled'] = TRUE;
+ $config['installedpackages']['nrpe2']['config'][0]['enabled'] = "on";
$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";
@@ -188,4 +188,4 @@ function nrpe2_custom_php_service()
}
}
-?> \ No newline at end of file
+?>
diff --git a/config/nrpe2/nrpe2.xml b/config/nrpe2/nrpe2.xml
index 723bbba9..55f96319 100644
--- a/config/nrpe2/nrpe2.xml
+++ b/config/nrpe2/nrpe2.xml
@@ -14,7 +14,7 @@
<url>/pkg_edit.php?xml=nrpe2.xml&amp;id=0</url>
</menu>
<service>
- <name>NRPEv2</name>
+ <name>nrpe2</name>
<rcfile>nrpe2</rcfile>
<executable>nrpe2</executable>
<description>Nagios NRPE Daemon</description>
@@ -159,6 +159,8 @@
nrpe2_custom_php_write_config();
</custom_php_deinstall_command>
<custom_php_resync_config_command>
+ nrpe2_custom_php_write_config();
+ nrpe2_custom_php_service();
</custom_php_resync_config_command>
<custom_php_command_before_form>
unset($_POST['temp']);