diff --git a/debian/changelog b/debian/changelog index 137c727..9630bc8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,119 +1,125 @@ +toollabs (1.3) unstable; urgency=low + + * Disable tomcat support in webservice, point to webservice2 + + -- Yuvi Panda Sat, 28 Feb 2015 13:39:09 +0530 + toollabs (1.2) unstable; urgency=low * Fix lintian warning for jQuery minified source -- Tim Landscheidt Thu, 26 Feb 2015 00:16:09 +0000 toollabs (1.1) unstable; urgency=low * Remove webservice2 from package, move to puppet repo [Yuvi Panda] -- Yuvi Panda Sat, 31 Jan 2015 13:00:01 +0530 toollabs (1.0.14) unstable; urgency=low * webservice2: Add uwsgi-python server type [Yuvi Panda] -- Yuvi Panda Tue, 23 Dec 2014 13:00:01 +0530 toollabs (1.0.13) unstable; urgency=low * webservice2: Fix crash for tools with special memory limits [Yuvi Panda] -- Yuvi Panda Tue, 02 Dec 2014 05:30:01 +0530 toollabs (1.0.12) unstable; urgency=low * webservice2: Added port of webservice to python [Yuvi Panda] * webservice2: Added support for running webservices on Trusty [Yuvi Panda] -- Yuvi Panda Fri, 28 Nov 2014 02:09:01 +0530 toollabs (1.0.11) unstable; urgency=low * become: Fix typo [Merlijn van Deen] -- Tim Landscheidt Thu, 21 Aug 2014 19:46:15 +0000 toollabs (1.0.10) unstable; urgency=low * Cut a clean release -- Tim Landscheidt Thu, 21 Aug 2014 18:35:53 +0000 toollabs (1.0.9) unstable; urgency=low * Merge of a number of patches: become: Add --help option [Tim Landscheidt] Package webservice [Tim Landscheidt] become: Made more user-friendly [Tim Landscheidt] Fix build and run-time dependencies [Tim Landscheidt] Work around pbuilder not properly setting $USER [Tim Landscheidt] Fix Lintian errors in jobutils man pages [Tim Landscheidt] Fix Lintian errors in misctools man pages [Tim Landscheidt] Simplify toolwatcher [Tim Landscheidt] Make dir a normal fd [Platonides] Retrieve $PACKAGE_VERSION from debian/changelog [Tim Landscheidt] -- Marc-André Pelletier Thu, 25 Jul 2014 11:00:00 -0400 toollabs (1.0.8dev) unstable; urgency=low * webservice: Enabled individual memory limits. -- Hedonil Thu, 24 Jul 2014 09:50:30 +0000 toollabs (1.0.7) unstable; urgency=low * Marc-André Pelletier: fixes for eqiad -- Marc-André Pelletier Fri, 28 Feb 2014 23:20:00 -0500 toollabs (1.0.6) unstable; urgency=low * Marc-André Pelletier: add webservice -- Marc-André Pelletier Thu, 19 Dec 2013 14:51:00 -0500 toollabs (1.0.5) unstable; urgency=low * Marc-André Pelletier: jsub should allow -q to override the queue name even when -continuous is used -- Marc-André Pelletier Thu, 5 Sep 2013 14:37:35 -0400 toollabs (1.0.4) unstable; urgency=low * Marc-André Pelletier: make jsub accept -M and -m for qsub, and provide a sane default for it -- Marc-André Pelletier Mon, 16 Jun 2013 16:42:00 -0400 toollabs (1.0.3) unstable; urgency=low * Tim Landscheidt: Add umask defaults for output files * Tim Landscheidt: other minor tweaks and fixes * Marc-André Pelletier: add rmtool -- Marc-André Pelletier Mon, 16 Jun 2013 16:42:00 -0400 toollabs (1.0.2) unstable; urgency=low * Tim Landscheidt: Add umask defaults for output files * Tim Landscheidt: other minor tweaks and fixes -- Marc-André Pelletier Mon, 10 Jun 2013 20:05:45 -0400 toollabs (1.0.1) unstable; urgency=low * Added copyright information * Minor tweaks to control files * Added missing job(1) command -- Marc-André Pelletier Mon, 10 Jun 2013 17:12:45 -0400 toollabs (1.0) unstable; urgency=low * Initial Release. -- Carl Fürstenberg Mon, 10 Jun 2013 20:35:30 +0200 diff --git a/misctools/webservice b/misctools/webservice index e5ef365..3f5897f 100755 --- a/misctools/webservice +++ b/misctools/webservice @@ -1,114 +1,114 @@ #! /bin/bash prefix=$(/bin/cat /etc/wmflabs-project) tool=$(/usr/bin/id -nu|sed -e "s/^$prefix.//") user="$prefix.$tool" server="lighttpd" public="public_html" memlimit=4g if [ -r "/data/project/.system/config/$tool.web-memlimit" ]; then memlimit=$(cat "/data/project/.system/config/$tool.web-memlimit") fi case "$1" in -tomcat) - server="tomcat" - public="public_tomcat" - shift + echo "Use webservice2 tomcat {start|stop|restart} to manage tomcat webservices" + echo "Calling webservice2 tomcat $2" + exec /usr/local/bin/webservice2 tomcat "$2" ;; -lighttpd) shift ;; -*) echo "Unknown webservice type $1" >&2 exit 1 ;; esac home=$(getent passwd $user | cut -d : -f 6 | sed -e 's/\/$//') if [ "$(getent group $user | cut -d : -f 1)" != "$user" ]; then echo "$0: $tool does not appear to be a tool" >&2 exit 1 fi if [ "$home" = "" -o ! -d "$home/$public" ]; then echo "$tool does not have a $public" >&2 exit 1 fi job=$(qstat -q "webgrid-$server" -j "$server-$tool" 2>&1 | grep job_number: | sed -e 's/^.* *\(.*\)$/\1/') if [ "$job" != "" ]; then si=$(qstat -j "$job" 2>&1 | grep 'scheduling info': | sed -e 's/^.*: *\(.*\)$/\1/') fi waitdown() { wj="$1" while [ "$wj" = "$1" ]; do wj=$(qstat -j "$1" 2>&1 | grep job_number: | sed -e 's/^.* *\(.*\)$/\1/') echo -n . sleep 1 done } case "$1" in start) echo -n "Starting webservice..." if [ "$job" != "" ]; then echo "Webservice already running." else if qsub -e $home/error.log -o $home/error.log -i /dev/null -q "webgrid-$server" -l h_vmem=$memlimit -b y -N "$server-$tool" /usr/local/bin/tool-$server >/dev/null 2>&1 ; then echo " started." else echo " failed." fi fi ;; restart) echo -n "Restarting webservice.." if [ "$job" != "" ]; then qdel -j "$job" >/dev/null 2>&1 waitdown "$job" else echo -n . fi if qsub -e $home/error.log -o /dev/null -i /dev/null -q "webgrid-$server" -l h_vmem=$memlimit -b y -N "$server-$tool" /usr/local/bin/tool-$server >/dev/null 2>&1; then echo " restarted." else echo " failed." fi ;; status) if [ "$job" != "" ]; then if [ "$si" != "" ]; then echo "Your webservice is scheduled:" echo " $si" else echo "Your webservice is running (job $job)." fi exit 0 else echo "Your webservice is not running." exit 1 fi ;; stop) if [ "$job" != "" ]; then echo -n "Stopping webservice.." qdel -j "$job" >/dev/null 2>&1 waitdown "$job" echo " stopped." else echo "Webservice not running." fi ;; *) echo "usage: $(basename $0) start|restart|status|stop" >&2 exit 1 ;; esac