2 files changed, 36 insertions, 21 deletions

diff --git a/security/snort/files/snort.sh b/security/snort/files/snort.sh
new file mode 100644
index 000000000000..d737bfd76385
--- /dev/null
+++ b/security/snort/files/snort.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+# $Id$
+
+# PROVIDE: snort
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: FreeBSD shutdown
+
+# Add the following lines to /etc/rc.conf to enable snort:
+# snort_enable (bool):		Set to YES to enable snort
+# 				Default: NO
+# snort_flags (str):		Extra flags passed to snort
+#				Default: -Dq
+# snort_interface (str):	Network interface to sniff
+#				Default: "" 
+# snort_conf (str):		Snort configuration file
+#				Default: ${PREFIX}/etc/snort.conf
+#
+
+. %%RC_SUBR%%
+
+name="snort"
+rcvar=`set_rcvar`
+
+command="%%PREFIX%%/bin/snort"
+
+load_rc_config $name
+
+[ -z "$snort_enable" ]    && snort_enable="NO"
+[ -z "$snort_conf" ]      && snort_conf="%%PREFIX%%/etc/snort.conf"
+[ -z "$snort_flags" ]     && snort_flags="-Dq"
+
+[ -n "$snort_interface" ] && snort_flags="$snort_flags -i $snort_interface"
+[ -n "$snort_conf" ]      && snort_flags="$snort_flags -c $snort_conf"
+
+run_rc_command "$1"
diff --git a/security/snort/files/snort.sh.sample b/security/snort/files/snort.sh.sample
deleted file mode 100644
index b1bb94874977..000000000000
--- a/security/snort/files/snort.sh.sample
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    exit 1
-fi
-
-case "$1" in
-start)
-    ${PREFIX}/bin/snort -Dqc ${PREFIX}/etc/snort.conf > /dev/null && echo -n " snort"
-    ;;
-stop)
-    kill `cat /var/run/snort_*.pid`
-    ;;
-restart)
-    killall -1 `cat /var/run/snort_*.pid`
-    ;;
-*)
-    echo "Usage: snort.sh [start|stop|restart]"
-    ;;
-esac