-HUP makes restarting snort unreliable. Removed it and modified if-el…

…se statement to an if-statement to ensure service will start. See forums: http://forum.pfsense.org/index.php/topic,50758.30.html, Reply pfsense#38.
uversy · Jul 4, 2012 · 9dc2c1e · 9dc2c1e
1 parent 0ab68c4
commit 9dc2c1e
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/config/snort/snort.inc b/config/snort/snort.inc
@@ -895,15 +895,15 @@ EOE;
 	fi
 	/bin/pgrep -nF {$g['varrun_path']}/snort_{$if_real}{$snort_uuid}.pid
 	if [ $? = 0 ]; then
-		/bin/pkill -HUP -F {$g['varrun_path']}/snort_{$if_real}{$snort_uuid}.pid -a
+		/bin/pkill -F {$g['varrun_path']}/snort_{$if_real}{$snort_uuid}.pid -a
 		/usr/bin/logger -p daemon.info -i -t SnortStartup "Snort SOFT START For {$value['descr']}({$snort_uuid}_{$if_real})..."
-	else
-		# Start snort and barnyard2
-		/bin/rm {$g['varrun_path']}/snort_{$if_real}{$snort_uuid}.pid
-		/usr/local/bin/snort -R {$snort_uuid} -D -q -l /var/log/snort/snort_{$if_real}{$snort_uuid} --pid-path {$g['varrun_path']} --nolock-pidfile -G {$snort_uuid} -c /usr/local/etc/snort/snort_{$snort_uuid}_{$if_real}/snort.conf -i {$if_real}
-		/usr/bin/logger -p daemon.info -i -t SnortStartup "Snort START For {$value['descr']}({$snort_uuid}_{$if_real})..."
 	fi
 
+	# Start snort and barnyard2
+	/bin/rm {$g['varrun_path']}/snort_{$if_real}{$snort_uuid}.pid
+	/usr/local/bin/snort -R {$snort_uuid} -D -q -l /var/log/snort/snort_{$if_real}{$snort_uuid} --pid-path {$g['varrun_path']} --nolock-pidfile -G {$snort_uuid} -c /usr/local/etc/snort/snort_{$snort_uuid}_{$if_real}/snort.conf -i {$if_real}
+	/usr/bin/logger -p daemon.info -i -t SnortStartup "Snort START For {$value['descr']}({$snort_uuid}_{$if_real})..."
+
 	sleep 2
 	{$start_barnyard2}