Break up /etc/default/tvheadend to make it easier for users to set relevant settings...

diff --git a/debian/tvheadend.default b/debian/tvheadend.default
index 5f8343f6937f5138c6402e5f599fe8954a11656c..a8d7c48a54de70198f3cfcf6531b417755bb8b2d 100644 (file)
--- a/debian/tvheadend.default
+++ b/debian/tvheadend.default
@@ -2,5 +2,41 @@
 # Default configuration for tvheadend
 #
 
-ENABLED=1
-DAEMON_ARGS="-f -u hts -g video"
+# TVH_ENABLED
+#   set to 0 to disable upstart job
+TVH_ENABLED=1
+
+# TVH_USER
+#   if set to "" will run as root
+TVH_USER="hts"
+
+# TVH_GROUP
+#   if set to "" will run as root
+TVH_GROUP="video"
+
+# TVH_CONF_DIR
+#   if set to "" will use ~TVH_USER/.hts/tvheadend
+TVH_CONF_DIR=""
+
+# TVH_ADAPTERS
+#   if set to "" will use all available adapters
+#   for select adapters use comma seperated list of adapter
+#   numbers, i.e. to use /dev/dvb/adapter0 and /dev/dvb/adapter1 only
+#   set as "0,1"
+TVH_ADAPTERS=""
+
+# TVH_HTTP_PORT
+#   if set to "" will use binary default
+TVH_HTTP_PORT=""
+
+# TVH_HTSP_PORT
+#   if set to "" will use binary default
+TVH_HTSP_PORT=""
+
+# TVH_DEBUG
+#   if set to 1 will output debug to syslog
+TVH_DEBUG=0
+
+# TVH_ARGS
+#   add any other arguments
+TVH_ARGS=""

diff --git a/debian/tvheadend.init b/debian/tvheadend.init
index 8f7818934c3fbc2b48c4fd020259aded72d9c021..8a24bdd8d34f43a8bd7d4c7cc0efe9e8df783223 100644 (file)
--- a/debian/tvheadend.init
+++ b/debian/tvheadend.init
@@ -16,7 +16,6 @@ PATH=/usr/sbin:/usr/bin:/sbin:/bin
 DESC="Tvheadend"
 NAME=tvheadend
 DAEMON=/usr/bin/$NAME
-DAEMON_ARGS="-f -u hts -g video"
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 
@@ -26,6 +25,18 @@ SCRIPTNAME=/etc/init.d/$NAME
 # Read configuration variable file if it is present
 [ -r /etc/default/$NAME ] && . /etc/default/$NAME
 
+# Configure command line options
+[ "$TVH_ENABLED" = "1" ] || exit 0
+
+ARGS="-f"
+[ -z "$TVH_USER"      ] || ARGS="$ARGS -u $TVH_USER"
+[ -z "$TVH_GROUP"     ] || ARGS="$ARGS -g $TVH_GROUP"
+[ -z "$TVH_CONF_DIR"  ] || ARGS="$ARGS -c $TVH_CONF_DIR"
+[ -z "$TVH_ADAPTERS"  ] || ARGS="$ARGS -a $TVH_ADAPTERS"
+[ -z "$TVH_HTTP_PORT" ] || ARGS="$ARGS -w $TVH_HTTP_PORT"
+[ -z "$TVH_HTSP_PORT" ] || ARGS="$ARGS -e $TVH_HTSP_PORT"
+[ "$TVH_DEBUG" = "1"  ] && ARGS="$ARGS -s"
+
 # Load the VERBOSE setting and other rcS variables
 [ -f /etc/default/rcS ] && . /etc/default/rcS
 
@@ -46,7 +57,7 @@ do_start()
        start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
                || return 1
        start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
-               $DAEMON_ARGS \
+               $ARGS \
                || return 2
 }
 

diff --git a/debian/tvheadend.upstart b/debian/tvheadend.upstart
index b009772d0621b184c5b86d8bf9f8cdef65c920c7..37b76b858c763ce7e678628c691c5866ffce03bb 100644 (file)
--- a/debian/tvheadend.upstart
+++ b/debian/tvheadend.upstart
@@ -13,10 +13,18 @@ expect fork
 respawn
 
 script
-  DAEMON_ARGS="-f -u hts -g video"
   [ -r /etc/default/tvheadend ] && . /etc/default/tvheadend
 
-  [ "$ENABLED" = "1" ] || exit 0
+  [ "$TVH_ENABLED" = "1" ] || exit 0
 
-  exec tvheadend $DAEMON_ARGS
+  ARGS="-f"
+  [ -z "$TVH_USER"      ] || ARGS="$ARGS -u $TVH_USER"
+  [ -z "$TVH_GROUP"     ] || ARGS="$ARGS -g $TVH_GROUP"
+  [ -z "$TVH_CONF_DIR"  ] || ARGS="$ARGS -c $TVH_CONF_DIR"
+  [ -z "$TVH_ADAPTERS"  ] || ARGS="$ARGS -a $TVH_ADAPTERS"
+  [ -z "$TVH_HTTP_PORT" ] || ARGS="$ARGS -w $TVH_HTTP_PORT"
+  [ -z "$TVH_HTSP_PORT" ] || ARGS="$ARGS -e $TVH_HTSP_PORT"
+  [ "$TVH_DEBUG" = "1"  ] && ARGS="$ARGS -s"
+
+  exec tvheadend $ARGS $TVH_ARGS
 end script