diff options
| author | Erik <erik@erikkristensen.com> | 2010-03-31 19:42:19 -0400 |
|---|---|---|
| committer | Erik <erik@erikkristensen.com> | 2010-03-31 19:42:19 -0400 |
| commit | 56f8ea7f9c81f3650fd9173081ce981129824cbd (patch) | |
| tree | ffe49c7f1ba6b9ef72d2891f9adfa45bdb6e11b5 | |
| parent | d3b9db41db672af5d08ad9f9bbc81ab98bacc2e8 (diff) | |
| parent | 1fd19a93e04e47fda72abf7246d061221e6b173a (diff) | |
| download | pfsense-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
| -rw-r--r-- | config/nrpe2/nrpe2.inc | 4 | ||||
| -rw-r--r-- | config/nrpe2/nrpe2.xml | 4 | ||||
| -rwxr-xr-x | pkg_config.7.xml | 4 |
3 files changed, 8 insertions, 4 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&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']); diff --git a/pkg_config.7.xml b/pkg_config.7.xml index 7182ca1c..44fe304d 100755 --- a/pkg_config.7.xml +++ b/pkg_config.7.xml @@ -909,12 +909,14 @@ </package> <package> <name>NRPE v2</name> - <website>http://example.org</website> + <website>http://wiki.nagios.org/index.php/Howtos:nrpe_nsca</website> <descr>NRPE is an addon for Nagios that allows you to execute plugins on remote Linux/Unix hosts. This is useful if you need to monitor local resources/attributes like disk usage, CPU load, memory usage, etc. on a remote host.</descr> <category>Services</category> <depends_on_package_base_url>http://www.pfsense.com/packages/config/nrpe2/bin/</depends_on_package_base_url> <depends_on_package>nrpe-2.12_1.tbz</depends_on_package> <depends_on_package>nagios-plugins-1.4.13,1.tbz</depends_on_package> + <depends_on_package>libiconv-1.11_1.tbz</depends_on_package> + <depends_on_package>gettext-0.17_1.tbz</depends_on_package> <config_file>http://www.pfsense.com/packages/config/nrpe2/nrpe2.xml</config_file> <version>2.11</version> <status>Beta</status> |