From cf757ee0aa208520fb85de4b4dadf4cf4d88be0b Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Thu, 8 Sep 2011 08:43:15 +0000
Subject: 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.

---
 config/snort/snort_check_for_rule_updates.php | 11 +----------
 config/snort/snort_download_rules.php         | 11 +----------
 2 files changed, 2 insertions(+), 20 deletions(-)

(limited to 'config/snort')

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..."));
-- 
cgit v1.2.3