Updated clarified module for new recorder init scripts

clarified/templates/probe.erb

@@ -1,63 +1,11 @@
-#!/bin/sh
-# Copyright (c) 2007 Clarified Networks Oy.  All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+#!/bin/bash
 
-CAPTURE_DIR=/var/lib/recorder/<%= name %>
-NETWORK_IFC=<%= interface_real %>
-PROBE_IDENT=<%= name %>
-SNAPLEN=<%= snaplen %>
-KEEPTIME=<%= keeptime %>
-MISC_OPTS='<%= miscopts %>'
+NETWORK_IFC="<%= interface_real %>"
+CAPTURE_DIR="/var/lib/recorder/<%= name %>"
+SNAPLEN="<%= snaplen %>"
+KEEPTIME="<%= keeptime %>"
+BLOCKSIZE="<%= blocksize %>"
+FILTER="<%= filter %>"
+OPTIONS="<%= probeopt %>"
 
 . /etc/clarified/clarified-functions
-
-start() {
-  if [ ! -z $SNAPLEN ]; then
-    PROBE_OPTIONS="-s $SNAPLEN"
-  fi
-  if [ ! -z $KEEPTIME ]; then
-    PROBE_OPTIONS="$PROBE_OPTIONS -k $KEEPTIME"
-  fi
-  eval start_probe ${PROBE_OPTIONS} ${MISC_OPTS} ${CAPTURE_DIR} ${NETWORK_IFC}
-  #LOG_SUCCESS "Probe" $PROBE_IDENT "up"
-}
-
-stop() {
-  stop_probe $PROBE_IDENT
-  #LOG_SUCCESS "Probe" $PROBE_IDENT "down"
-}
-
-case "$1" in
-  start)
-        start
-        ;;
-  stop)
-        stop
-        ;;
-  restart|force-reload)
-        stop
-        sleep 2
-        start
-        ;;
-  *)
-        echo "Usage: $0 {start|stop|restart|force-reload}" >&2
-        exit 1
-        ;;
-esac