merge from trunk

pkg/kamailio/deb/squeeze/changelog

@@ -1,3 +1,20 @@
+kamailio (3.3+ngcp2.6.2) unstable; urgency=low
+
+  * Fix bad tagging
+
+ -- Jon Bonilla <jbonilla@sipwise.com>  Thu, 23 Aug 2012 21:51:43 +0200
+
+kamailio (3.3+ngcp2.6.1) unstable; urgency=low
+
+  [ Michael Prokop ]
+  * Provide postrm script
+  * Provide postinst script, taking care of services restarts in HA mode
+
+  [ jbonilla ]
+  * re-add init stuff 
+
+ -- Jon Bonilla <jbonilla@sipwise.com>  Thu, 23 Aug 2012 17:23:00 +0200
+
 kamailio (3.3+ngcp2.6.0) unstable; urgency=low
 
   [ rfuchs ]

pkg/kamailio/deb/squeeze/kamailio.postinst

@@ -8,30 +8,51 @@ HOMEDIR=/var/run/kamailio
 
 set -e
 
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-#
-# quoting from the policy:
-#     Any necessary prompting should almost always be confined to the
-#     post-installation script, and should be protected with a conditional
-#     so that unnecessary prompting doesn't happen if a package's
-#     installation fails and the `postinst' is called with `abort-upgrade',
-#     `abort-remove' or `abort-deconfigure'.
+restart_handler() {
+  [ -n "$1" ] || return 1
+
+  if [ -x "/etc/init.d/$1" ]; then
+    if [ -x "$(which invoke-rc.d 2>/dev/null)" ]; then
+      invoke-rc.d "$1" restart || exit $?
+    else
+      /etc/init.d/"$1" restart || exit $?
+    fi
+  fi
+}
+
+initscript_handler() {
+  [ -n "$1" ] || return 1
+
+  if [ -x "/etc/init.d/$1" ]; then
+    update-rc.d "$1" defaults >/dev/null
+    invoke-rc.d "$1" start || exit $?
+  fi
+}
+
+init_handler() {
+  # just invoke init script wrappers on ce systems since
+  # they do not provide ngcp-check_active and we don't
+  # have to handle inactive nodes
+  if ! [ -x "$(which ngcp-check_active 2>/dev/null)" ]; then
+    restart_handler "$1"
+    initscript_handler "$1"
+  else # do not restart daemon on inactive node in pro systems
+    if ngcp-check_active ; then
+      echo "Active node detected, restarting $1"
+      restart_handler "$1"
+    else
+      echo "Inactive node detected, ignoring request to restart $1"
+    fi
+  fi
+}
 
 case "$1" in
     configure)
         adduser --quiet --system --group --disabled-password \
                 --shell /bin/false --gecos "Kamailio" \
                 --home $HOMEDIR kamailio || true
-
+        init_handler kamailio-lb
+        init_handler kamailio-proxy
         ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

pkg/kamailio/deb/squeeze/kamailio.postrm

@@ -0,0 +1,19 @@
+#!/bin/sh
+# postrm script for kamailio
+
+set -e
+
+removal_wrapper() {
+  # remove the init script only on ce systems, as the
+  # the pro system handle it inside the monitoring/HA setup
+  if ! [ -x "$(which ngcp-check_active 2>/dev/null)" ]; then
+    update-rc.d kamailio-lb    remove >/dev/null
+    update-rc.d kamailio-proxy remove >/dev/null
+  fi
+}
+
+if [ "$1" = "purge" ] ; then
+  removal_wrapper
+fi
+
+exit 0

pkg/kamailio/deb/squeeze/rules

@@ -186,7 +186,7 @@ binary-common:
 #	dh_installemacsen
 #	dh_installpam
 #	dh_installmime
-#	dh_installinit  -- defaults 23
+	dh_installinit  -- defaults 23
 	dh_installcron
 	dh_installman
 	dh_installinfo