Install rackup and thin configurations in /etc/geocoder; modify default, init, postinst scripts to bring the REST server up on boot, assuming that a database is correctly set in /etc/default/geocoder-us.

Author: ieure

debian/control

@@ -8,6 +8,6 @@ Homepage: http://github.com/simplegeo/geocoder/
 
 Package: geocoder-us
 Architecture: any
-Depends: libsqlite3-0, libsqlite3-ruby (>= 1.3.0), libsinatra-ruby, libjson-ruby
+Depends: libsqlite3-0, libsqlite3-ruby (>= 1.3.0), libsinatra-ruby, libjson-ruby, thin
 Description: A US address geocoder.
  A US address geocoder. Requires a suitable database.

debian/geocoder-us.default

@@ -1 +1 @@
-DAEMON_OPTS=/var/lib/geocoder/geocoder-us.db
+GEOCODER_US=/var/lib/geocoder/geocoder-us.db

debian/init.d renamed to debian/geocoder-us.init

@@ -12,14 +12,14 @@
 #
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/geocoderd
+DAEMON=/usr/bin/thin
+DAEMON_OPTS="-C /etc/geocoder/thin.yml -R /etc/geocoder/geocoder.ru"
 NAME=geocoder
 DESC="geocoder server"
 
 test -x $DAEMON || exit 0
 
-LOGDIR=/var/log/geocoder
-PIDFILE=/var/run/$NAME.pid
+PIDFILE=/var/run/$NAME/$NAME.pid
 DODTIME=3                   # Time to wait for the server to die, in seconds
                             # If this value is set too low you might not
                             # let some servers to die gracefully and
@@ -29,6 +29,14 @@ DODTIME=3                   # Time to wait for the server to die, in seconds
 if [ -f /etc/default/geocoder-us ] ; then
     . /etc/default/geocoder-us
 fi
+# $DATABASE should be set to the location of the database in /etc/default/gecoder-us
+[ -z "$DATABASE" ] && exit 0
+if [ ! -r "$DATABASE" ] ; then
+    echo "$DATABASE not found; not running command."
+    exit 0
+fi
+# set the environment variable so that the daemon can find the database
+export GEOCODER_DB="$DATABASE"
 
 set -e
 
@@ -39,7 +47,7 @@ running_pid()
     name=$2
     [ -z "$pid" ] && return 1
     [ ! -d /proc/$pid ] &&  return 1
-    cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1 |cut -d : -f 1`
+    cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1 |cut -d" " -f 1`
     # Is this the expected child?
     [ "$cmd" != "$name" ] &&  return 1
     return 0
@@ -54,7 +62,7 @@ running()
     [ ! -f "$PIDFILE" ] && return 1
     # Obtain the pid and check it against the binary name
     pid=`cat $PIDFILE`
-    running_pid $pid $DAEMON || return 1
+    running_pid $pid `basename $DAEMON` || return 1
     return 0
 }
 
@@ -80,22 +88,24 @@ force_stop() {
 
 case "$1" in
   start)
+        running && exit 0
         echo -n "Starting $DESC: "
-        start-stop-daemon --start --quiet --pidfile $PIDFILE \
-            --exec $DAEMON -- $DAEMON_OPTS
+        $DAEMON $DAEMON_OPTS $1
+        sleep 1
         if running ; then
             echo "$NAME."
         else
             echo " ERROR."
         fi
         ;;
   stop)
+        running || exit 0
         echo -n "Stopping $DESC: "
-        start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-            --exec $DAEMON
+        $DAEMON $DAEMON_OPTS $1
         echo "$NAME."
         ;;
   force-stop)
+        running || exit 0
         echo -n "Forcefully stopping $DESC: "
         force_stop
         if ! running ; then
@@ -123,18 +133,13 @@ case "$1" in
         # just the same as "restart" except that it does nothing if the
         # daemon isn't already running.
         # check wether $DAEMON is running. If so, restart
-        start-stop-daemon --stop --test --quiet --pidfile \
-            /var/run/$NAME.pid --exec $DAEMON \
-            && $0 restart \
-            || exit 0
+        running || exit 0
+        $DAEMON $DAEMON_OPTS stop && $DAEMON $DAEMON_OPTS start
         ;;
   restart)
-    echo -n "Restarting $DESC: "
-        start-stop-daemon --stop --quiet --pidfile \
-            /var/run/$NAME.pid --exec $DAEMON
-        [ -n "$DODTIME" ] && sleep $DODTIME
-        start-stop-daemon --start --quiet --pidfile \
-            /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
+        running || exit 0
+        echo -n "Restarting $DESC: "
+        $DAEMON $DAEMON_OPTS restart
         echo "$NAME."
         ;;
   status)

debian/postinst renamed to debian/geocoder-us.postinst

@@ -20,7 +20,8 @@ set -e
 
 case "$1" in
     configure)
-        mkdir -p /var/lib/geocoder
+         # just make sure that /usr/bin/thin can write its PID file here
+         chown www-data /var/run/geocoder
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

debian/rules

@@ -3,6 +3,8 @@ SHELL	= /bin/bash
 
 tmp	= debian/tmp
 sbindir	= /usr/sbin
+vardir  = /var
+etcdir  = /etc
 libdir18 = $(shell ruby1.8 -r rbconfig -e 'print Config::CONFIG["rubylibdir"]')
 archdir18 = $(shell ruby1.8 -r rbconfig -e 'print Config::CONFIG["archdir"]')
 libdir19 = $(shell ruby1.9.1 -r rbconfig -e 'print Config::CONFIG["rubylibdir"]')
@@ -23,6 +25,7 @@ build-ruby1.8-stamp:
 
 	# configure
 	ruby1.8 setup.rb config \
+		--sysconfdir=$(shell pwd)/$(tmp)$(etcdir) \
 		--bin-dir=$(shell pwd)/$(tmp)$(sbindir) \
 		--rb-dir=$(shell pwd)/$(tmp)$(libdir18) \
 		--so-dir=$(shell pwd)/$(tmp)$(archdir18)
@@ -43,6 +46,7 @@ build-ruby1.9.1-stamp: $(QUILT_STAMPFN)
 
 	# configure
 	ruby1.9.1 setup.rb config \
+		--sysconfdir=$(shell pwd)/$(tmp)$(etcdir) \
 		--bin-dir=$(shell pwd)/$(tmp)$(sbindir) \
 		--rb-dir=$(shell pwd)/$(tmp)$(libdir19) \
 		--so-dir=$(shell pwd)/$(tmp)$(archdir19)
@@ -61,9 +65,13 @@ install: build
 
 	echo $(tmp)$(libdir18) >debian/geocoder-us.install
 	echo $(tmp)$(sbindir) >>debian/geocoder-us.install
+	echo $(tmp)$(vardir) >>debian/geocoder-us.install
+	echo $(tmp)$(etcdir) >>debian/geocoder-us.install
+
+	mkdir -p $(tmp)$(vardir)/lib/geocoder
+	mkdir -p $(tmp)$(vardir)/run/geocoder
 
 	#echo $(tmp)$(libdir19) >debian/libsqlite3-ruby1.9.1.install
-	#echo $(tmp)$(archdir19) >>debian/libsqlite3-ruby1.9.1.install
 
 	dh_install
 
@@ -88,6 +96,9 @@ binary-arch: install
 	dh_testdir -a
 	dh_testroot -a
 
+	# install init script and default
+	dh_installinit
+
 	# dh_installchangelogs -a CHANGELOG.rdoc
 	dh_installdocs -a -A README.rdoc
 	dh_link -a