Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-suricata

src/initscripts/packages/keepalived

@@ -13,6 +13,12 @@
 
 case "${1}" in
 	start)
+		# Load IPVS module
+		modprobe ip_vs
+
+		# Enable connection tracking for IPVS
+		sysctl -w net.ipv4.vs.conntrack=1 &>/dev/null
+
 		boot_mesg "Starting keepalive daemon..."
 		loadproc /usr/sbin/keepalived ${KEEPALIVED_OPTIONS}
 		;;

src/initscripts/system/conntrackd

@@ -0,0 +1,41 @@
+#!/bin/sh
+########################################################################
+# Begin $rc_base/init.d/conntrackd
+########################################################################
+
+. /etc/sysconfig/rc
+. ${rc_functions}
+
+case "${1}" in
+	start)
+		# Don't attempt to launch the daemon when we have no configuration
+		if [ ! -s "/etc/conntrackd/conntrackd.conf" ]; then
+			exit 0
+		fi
+
+		boot_mesg "Starting Connection Tracking Daemon..."
+		loadproc /usr/sbin/conntrackd -d
+		;;
+
+	stop)
+		boot_mesg "Stopping Connection Tracking Daemon..."
+		killproc /usr/sbin/conntrackd
+		;;
+
+	restart)
+		${0} stop
+		sleep 1
+		${0} start
+		;;
+
+	status)
+		statusproc /usr/sbin/conntrackd
+		;;
+
+	*)
+		echo "Usage: ${0} {start|stop|restart|status}"
+		exit 1
+		;;
+esac
+
+# End $rc_base/init.d/conntrackd