Use upstart instead of init scripts for uwsgi emperor.

debian/barbican-api.init

@@ -1,94 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          barbican-api
-# Required-Start:    $network $local_fs $remote_fs $syslog
-# Required-Stop:     $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Barbican API server
-# Description:       Frontend Barbican API server
-### END INIT INFO
-
-# Author: John Wood <john.wood@rackspace.com>
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Key Management Service API"
-NAME=barbican-api
-DAEMON=/usr/bin/barbican-api
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-
-# 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
-
-. /lib/lsb/init-functions
-
-do_start()
-{
-	start-stop-daemon --start --background --quiet --chuid barbican:barbican --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null \
-		|| return 1
-	start-stop-daemon --start --background --quiet --chuid barbican:barbican --make-pidfile --pidfile $PIDFILE --startas $DAEMON \
-		|| return 2
-}
-
-do_stop()
-{
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
-	RETVAL="$?"
-	rm -f $PIDFILE
-
-        # TBD: HACK ALERT! Need to figure out why uwsgi spawns a separate process!
-        killall -s SIGKILL uwsgi
-
-	return "$RETVAL"
-}
-
-case "$1" in
-  start)
-    log_daemon_msg "Starting $DESC" "$NAME"
-    do_start
-    case "$?" in
-		0|1) log_end_msg 0 ;;
-		2) log_end_msg 1 ;;
-	esac
-  ;;
-  stop)
-	log_daemon_msg "Stopping $DESC" "$NAME"
-	do_stop
-	case "$?" in
-		0|1) log_end_msg 0 ;;
-		2) log_end_msg 1 ;;
-	esac
-	;;
-  status)
-       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-       ;;
-  restart|force-reload)
-	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|status|restart|force-reload}" >&2
-	exit 3
-	;;
-esac
-
-:

debian/barbican-api.install

@@ -1,4 +1,5 @@
 etc/barbican/barbican-api-paste.ini etc/barbican
+etc/barbican/barbican-admin-paste.ini etc/barbican
 etc/barbican/barbican-api.conf etc/barbican
-etc/barbican/barbican-api.ini etc/barbican
-usr/bin/barbican-api
+etc/barbican/vassals/barbican-api.ini etc/barbican/vassals
+etc/barbican/vassals/barbican-admin.ini etc/barbican/vassals

debian/barbican-api.upstart

@@ -0,0 +1,7 @@
+# Barbican script
+
+description "Barbican Key Management APIs"
+start on runlevel [2345]
+stop on runlevel [06]
+
+exec uwsgi --master --die-on-term --emperor /etc/barbican/vassals