From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Fri, 29 Jul 2016 11:29:13 +0000 (+0200)
Subject: initscripts: Drop guardian related code from snort initscript.
X-Git-Tag: v2.19-core104~8^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dcb6493a0cc32211c713615465ddf39bc3c1916f;p=ipfire-2.x.git

initscripts: Drop guardian related code from snort initscript.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---

diff --git a/src/initscripts/init.d/snort b/src/initscripts/init.d/snort
index 58edf1e6db..5c4304247d 100644
--- a/src/initscripts/init.d/snort
+++ b/src/initscripts/init.d/snort
@@ -94,19 +94,8 @@ case "$1" in
 			sleep 1
                         chmod 644 /var/run/snort_$DEVICE.pid
                 done
-                
-	  
-                if [ -r /var/ipfire/guardian/enable ]; then
-		              IFACE=`/bin/cat /var/ipfire/red/iface 2>/dev/null | /usr/bin/tr -d '\012'`
-	                sed -e "s/^Interface.*/Interface       ${IFACE}/" /var/ipfire/guardian/guardian.conf > temp
-	                mv temp /var/ipfire/guardian/guardian.conf
-			chown nobody.root /var/ipfire/guardian/guardian.conf
-	              
-                  boot_mesg "Starting Guardian..."
-		              loadproc /usr/local/bin/guardian.pl -c /var/ipfire/guardian/guardian.conf
-		            fi
-		    ;;
-                
+	;;
+
         stop)
                DEVICES=""
                if [ -r /var/run/snort_$BLUE_DEV.pid ]; then
@@ -132,11 +121,6 @@ case "$1" in
               done
               
               rm /var/run/snort_* >/dev/null 2>/dev/null
-                
-              if ([ -r /var/ipfire/guardian/enable ] || [ ! -z $(pidofproc /usr/local/bin/guardian.pl) ]); then
-		          boot_mesg "Stopping Guardian..."
-		          killproc /usr/local/bin/guardian.pl
-		          fi
 
 		# Don't report returncode of rm if snort was not started
 		exit 0