aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorJim P <jim@pingle.org>2014-02-03 06:41:04 -0800
committerJim P <jim@pingle.org>2014-02-03 06:41:04 -0800
commit009498abc6de6dfcec82ad2f88d1e096a3a76287 (patch)
treed1bddc3723312d55c8ae0a0954491dfb3b976674 /config
parent2c6efc978d2fc988ff8fafbf59bcdc6050a3695d (diff)
parent1be457fba0f67cea5527cf8796cca84938674a1b (diff)
downloadpfsense-packages-009498abc6de6dfcec82ad2f88d1e096a3a76287.tar.gz
pfsense-packages-009498abc6de6dfcec82ad2f88d1e096a3a76287.tar.bz2
pfsense-packages-009498abc6de6dfcec82ad2f88d1e096a3a76287.zip
Merge pull request #585 from phil-davis/master
Service Watchdog manage cron job on package install and deinstall
Diffstat (limited to 'config')
-rw-r--r--config/servicewatchdog/servicewatchdog.inc6
-rw-r--r--config/servicewatchdog/servicewatchdog.xml10
2 files changed, 11 insertions, 5 deletions
diff --git a/config/servicewatchdog/servicewatchdog.inc b/config/servicewatchdog/servicewatchdog.inc
index 1bdb1ce9..696e570e 100644
--- a/config/servicewatchdog/servicewatchdog.inc
+++ b/config/servicewatchdog/servicewatchdog.inc
@@ -48,14 +48,14 @@ function servicewatchdog_is_service_watched($svc) {
return false;
}
-function servicewatchdog_cron_job() {
+function servicewatchdog_cron_job($force_remove) {
global $config;
if (!is_array($config['installedpackages']['servicewatchdog']['item'])) {
$config['installedpackages']['servicewatchdog']['item'] = array();
}
$a_pwservices = &$config['installedpackages']['servicewatchdog']['item'];
- if (count($a_pwservices) > 0) {
+ if (($force_remove == false) && (count($a_pwservices) > 0)) {
// Add the cron job if it doesn't exist.
install_cron_job("/usr/local/pkg/servicewatchdog_cron.php", true, "*/1");
} else {
@@ -80,4 +80,4 @@ function servicewatchdog_check_services() {
}
}
-?> \ No newline at end of file
+?>
diff --git a/config/servicewatchdog/servicewatchdog.xml b/config/servicewatchdog/servicewatchdog.xml
index 5e1ce309..3df25c3c 100644
--- a/config/servicewatchdog/servicewatchdog.xml
+++ b/config/servicewatchdog/servicewatchdog.xml
@@ -40,7 +40,7 @@
<requirements>None</requirements>
<faq>Monitors for stopped services and restarts them.</faq>
<name>Service Watchdog</name>
- <version>1.4</version>
+ <version>1.5</version>
<title>Services: Service Watchdog</title>
<include_file>/usr/local/pkg/servicewatchdog.inc</include_file>
<menu>
@@ -69,4 +69,10 @@
<chmod>644</chmod>
<item>http://www.pfsense.com/packages/config/servicewatchdog/servicewatchdog.inc</item>
</additional_files_needed>
-</packagegui> \ No newline at end of file
+ <custom_php_install_command>
+ servicewatchdog_cron_job();
+ </custom_php_install_command>
+ <custom_php_deinstall_command>
+ servicewatchdog_cron_job(true);
+ </custom_php_deinstall_command>
+</packagegui>