diff options
| author | Ermal <eri@pfsense.org> | 2011-09-08 08:43:15 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2011-09-08 08:43:15 +0000 |
| commit | cf757ee0aa208520fb85de4b4dadf4cf4d88be0b (patch) | |
| tree | 9f73593ace0088615c8a7c4849f65c95ee54fbfd /config | |
| parent | 07d3df2d6fa26c62d29a649f9673a4f82c62f1b1 (diff) | |
| download | pfsense-packages-cf757ee0aa208520fb85de4b4dadf4cf4d88be0b.tar.gz pfsense-packages-cf757ee0aa208520fb85de4b4dadf4cf4d88be0b.tar.bz2 pfsense-packages-cf757ee0aa208520fb85de4b4dadf4cf4d88be0b.zip | |
snort.sh script understands of reloading snort so just use that rather than triggering a stop and then start. Also correct repsective file names inside the files while here.
Diffstat (limited to 'config')
| -rw-r--r-- | config/snort/snort_check_for_rule_updates.php | 11 | ||||
| -rw-r--r-- | config/snort/snort_download_rules.php | 11 |
2 files changed, 2 insertions, 20 deletions
diff --git a/config/snort/snort_check_for_rule_updates.php b/config/snort/snort_check_for_rule_updates.php index 995dc4bc..2292dabd 100644 --- a/config/snort/snort_check_for_rule_updates.php +++ b/config/snort/snort_check_for_rule_updates.php @@ -1,7 +1,6 @@ <?php -/* $Id$ */ /* - snort_rulesets.php + snort_check_for_rule_updates.php Copyright (C) 2006 Scott Ullrich Copyright (C) 2009 Robert Zelaya Copyright (C) 2011 Ermal Luci @@ -682,14 +681,6 @@ else if ($snort_md5_check_ok == 'on' && $emerg_md5_check_ok == 'on' && $pfsense_ else { /* You are Not Up to date, always stop snort when updating rules for low end machines */; update_status(gettext("You are NOT up to date...")); - $chk_if_snort_up = exec("pgrep -x snort"); - if ($chk_if_snort_up != "") { - update_output_window(gettext("Stopping Snort service...")); - exec("/usr/bin/touch /tmp/snort_download_halt.pid"); - exec("/bin/sh /usr/local/etc/rc.d/snort.sh stop"); - sleep(2); - } - exec("/bin/sh /usr/local/etc/rc.d/snort.sh start"); update_status(gettext("The Rules update finished...")); update_output_window(gettext("Snort has restarted with your new set of rules...")); diff --git a/config/snort/snort_download_rules.php b/config/snort/snort_download_rules.php index b3a0fd80..36a19e79 100644 --- a/config/snort/snort_download_rules.php +++ b/config/snort/snort_download_rules.php @@ -1,7 +1,6 @@ <?php -/* $Id$ */ /* - snort_rulesets.php + snort_download_rules.php Copyright (C) 2006 Scott Ullrich Copyright (C) 2009 Robert Zelaya Copyright (C) 2011 Ermal Luci @@ -748,14 +747,6 @@ else if ($snort_md5_check_ok == 'on' && $emerg_md5_check_ok == 'on' && $pfsense_ else { /* You are Not Up to date, always stop snort when updating rules for low end machines */; update_status(gettext("You are NOT up to date...")); - $chk_if_snort_up = exec("pgrep -x snort"); - if ($chk_if_snort_up != "") { - update_output_window(gettext("Stopping Snort service...")); - exec("/usr/bin/touch /tmp/snort_download_halt.pid"); - exec("/bin/sh /usr/local/etc/rc.d/snort.sh stop"); - sleep(2); - } - exec("/bin/sh /usr/local/etc/rc.d/snort.sh start"); update_status(gettext("The Rules update finished...")); update_output_window(gettext("Snort has restarted with your new set of rules...")); |