Author: malat-guest Date: 2011-07-19 15:09:24 +0000 (Tue, 19 Jul 2011) New Revision: 7309
Added: trunk/packages/dcmtk/trunk/debian/storescp.default trunk/packages/dcmtk/trunk/debian/storescp.init Modified: trunk/packages/dcmtk/trunk/debian/changelog trunk/packages/dcmtk/trunk/debian/dcmtk.postinst trunk/packages/dcmtk/trunk/debian/rules Log: Adding a daemon for storescp Modified: trunk/packages/dcmtk/trunk/debian/changelog =================================================================== --- trunk/packages/dcmtk/trunk/debian/changelog 2011-07-19 12:59:36 UTC (rev 7308) +++ trunk/packages/dcmtk/trunk/debian/changelog 2011-07-19 15:09:24 UTC (rev 7309) @@ -1,3 +1,9 @@ +dcmtk (3.6.0-8) unstable; urgency=low + + * Adding a storescp daemon + + -- Mathieu Malaterre <[email protected]> Tue, 19 Jul 2011 17:08:19 +0200 + dcmtk (3.6.0-7) unstable; urgency=low * Add a patch (from current git/master) to fix a regression. Closes: #630781 Modified: trunk/packages/dcmtk/trunk/debian/dcmtk.postinst =================================================================== --- trunk/packages/dcmtk/trunk/debian/dcmtk.postinst 2011-07-19 12:59:36 UTC (rev 7308) +++ trunk/packages/dcmtk/trunk/debian/dcmtk.postinst 2011-07-19 15:09:24 UTC (rev 7309) @@ -18,6 +18,7 @@ [ -d /var/lib/dcmtk/db ] || mkdir -p /var/lib/dcmtk/db chmod 755 /var/lib/dcmtk/db chown -h -R dcmtk:dcmtk /var/lib/dcmtk/db || true +[ -d /var/lib/dcmtk/db/STORESCP ] || mkdir -p /var/lib/dcmtk/db/STORESCP # Handle imagectn -> dcmqrdb transition in (3.5.3 -> 3.5.4) Modified: trunk/packages/dcmtk/trunk/debian/rules =================================================================== --- trunk/packages/dcmtk/trunk/debian/rules 2011-07-19 12:59:36 UTC (rev 7308) +++ trunk/packages/dcmtk/trunk/debian/rules 2011-07-19 15:09:24 UTC (rev 7309) @@ -193,6 +193,7 @@ dh_installdocs -a dh_installexamples -a dh_installinit -a --name=dcmqrscp + dh_installinit -a --name=storescp dh_installman -a dh_install -a chmod 755 $(PKGDIR_DCMTK_WWW)/usr/lib/dcmtk/cgi-bin/*.p[lh] Added: trunk/packages/dcmtk/trunk/debian/storescp.default =================================================================== --- trunk/packages/dcmtk/trunk/debian/storescp.default (rev 0) +++ trunk/packages/dcmtk/trunk/debian/storescp.default 2011-07-19 15:09:24 UTC (rev 7309) @@ -0,0 +1,3 @@ +# Run storescp at startup ? +STORESCP_ENABLE=No + Added: trunk/packages/dcmtk/trunk/debian/storescp.init =================================================================== --- trunk/packages/dcmtk/trunk/debian/storescp.init (rev 0) +++ trunk/packages/dcmtk/trunk/debian/storescp.init 2011-07-19 15:09:24 UTC (rev 7309) @@ -0,0 +1,157 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: storescp +# Required-Start: $network $local_fs +# Required-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: <Enter a short description of the sortware> +# Description: <Enter a long description of the software> +# <...> +# <...> +### END INIT INFO + +# Author: Mathieu Malaterre <[email protected]> + +# PATH should only include /usr/* if it runs after the mountnfs.sh script +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="DCMTK storescp" +NAME=storescp +DAEMON=/usr/bin/$NAME # Introduce the server's location here +STORESCP_PORT="5678" +DAEMON_ARGS="-v --output-directory /var/lib/dcmtk/db/STORESCP +xa +ac $STORESCP_PORT" # Arguments to run the daemon with +PIDFILE=/var/run/$NAME.pid +SCRIPTNAME=/etc/init.d/$NAME +STORESCP_CFG="/etc/dcmtk/storescp.cfg" + +# Exit if the package is not installed +[ -x $DAEMON ] || exit 0 + +# Read configuration variable file if it is present +[ -r /etc/default/$NAME ] && . /etc/default/$NAME + +# Load the VERBOSE setting and other rcS variables +. /lib/init/vars.sh + +# Define LSB log_* functions. +# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. +. /lib/lsb/init-functions + +# +# Function that starts the daemon/service +# +do_start() +{ + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # 2 if daemon could not be started + #start-stop-daemon --start --verbose --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ + # || return 1 + echo "bla" + start-stop-daemon --background --start --verbose --make-pidfile --pidfile $PIDFILE --exec $DAEMON -- \ + $DAEMON_ARGS + # Add code here, if necessary, that waits for the process to be ready + # to handle requests from services started subsequently which depend + # on this one. As a last resort, sleep for some time. +} + +# +# Function that stops the daemon/service +# +do_stop() +{ + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # 2 if daemon could not be stopped + # other if a failure occurred + #start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME + #RETVAL="$?" + #[ "$RETVAL" = 2 ] && return 2 + # Wait for children to finish too if this is a daemon that forks + # and if the daemon is only ever run from this initscript. + # If the above conditions are not satisfied then add some other code + # that waits for the process to drop all resources that could be + # needed by services started subsequently. A last resort is to + # sleep for some time. + start-stop-daemon --stop --verbose --oknodo --pidfile $PIDFILE + RETVAL="$?" + #[ "$?" = 2 ] && return 2 + # Many daemons don't delete their pidfiles when they exit. + rm -f $PIDFILE + return "$RETVAL" +} + +# +# Function that sends a SIGHUP to the daemon/service +# +do_reload() { + # + # If the daemon can reload its configuration without + # restarting (for example, when it is sent a SIGHUP), + # then implement that here. + # + start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME + return 0 +} + +case "$1" in + start) + [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME" + do_start + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + stop) + [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" + do_stop + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + status) + status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? + ;; + #reload|force-reload) + # + # If do_reload() is not implemented then leave this commented out + # and leave 'force-reload' as an alias for 'restart'. + # + #log_daemon_msg "Reloading $DESC" "$NAME" + #do_reload + #log_end_msg $? + #;; + restart|force-reload) + # + # If the "reload" option is implemented then remove the + # 'force-reload' alias + # + log_daemon_msg "Restarting $DESC" "$NAME" + do_stop + case "$?" in + 0|1) + do_start + case "$?" in + 0) log_end_msg 0 ;; + 1) log_end_msg 1 ;; # Old process is still running + *) log_end_msg 1 ;; # Failed to start + esac + ;; + *) + # Failed to stop + log_end_msg 1 + ;; + esac + ;; + *) + #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 + echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 + exit 3 + ;; +esac + +: Property changes on: trunk/packages/dcmtk/trunk/debian/storescp.init ___________________________________________________________________ Added: svn:executable + * _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
