oversip 0.9.1 → 1.0.0

data/debian/control

@@ -8,7 +8,7 @@ Standards-Version: 3.9.3
 
 Package: oversip
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.9.1, ruby1.9.1-dev, make, g++, libssl-dev, libev-dev
+Pre-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.9.1, ruby1.9.1-dev, make, g++, libssl-dev, libev-dev
 Recommends: unbound
 Description: OverSIP (the SIP dreams factory) is an async SIP proxy/server programmable in Ruby language.
   Some features of OverSIP are:

data/debian/oversip.init

@@ -29,54 +29,45 @@ UBUNTU_LOGGING=0
 
 [ -r /etc/default/$NAME ] && . /etc/default/$NAME
 
-# Ensure Ruby executable is installed.
-which $RUBY_EXE >/dev/null
-if [ $? -ne 0 ] ; then
-  log_failure_msg "ruby1.9.1 is not installed, exiting."
-  log_end_msg 5
-  exit 5
-fi
 
-# Check whether OverSIP Ruby Gem is installed and get the executable location.
-DAEMON=$(which $NAME)
-if [ $? -ne 0 ] ; then
-  log_failure_msg "$DESC ($NAME): Ruby Gem '$RUBY_GEM' is not installed, exiting."
+# Checks for the start action.
+if [ "$1" == "start" ] ; then
 
-  case "$1" in
-  status)
-    # LSB - 4: program or service status is unknown.
-    log_end_msg 4
-    exit 4
-    ;;
-  *)
-    # LSB - 5: program is not installed.
+  # Ensure that the admin has set RUN=yes in /etc/default/$NAME file.
+  if [ "$RUN" != "yes" ] ; then
+    log_failure_msg "$DESC ($NAME) not yet configured. Set RUN=yes in /etc/default/$NAME."
+    exit 0
+  fi
+
+  # Ensure Ruby executable is installed.
+  which $RUBY_EXE >/dev/null
+  if [ $? -ne 0 ] ; then
+    log_failure_msg "ruby1.9.1 is not installed, exiting."
     log_end_msg 5
     exit 5
-    ;;
-  esac
-fi
+  fi
 
-if [ ! -x $DAEMON ]; then
-  log_failure_msg "$DESC ($NAME): executable '$DAEMON' does not exist or has not execution access. It should be provided by Ruby Gem '$RUBY_GEM'."
+  # Check whether OverSIP Ruby Gem is installed and get the executable location.
+  DAEMON=$(which $NAME)
+  if [ $? -ne 0 ] ; then
+    log_failure_msg "$DESC ($NAME): Ruby Gem '$RUBY_GEM' is not installed, exiting."
+
+    case "$1" in
+    status)
+      # LSB - 4: program or service status is unknown.
+      log_end_msg 4
+      exit 4
+      ;;
+    *)
+      # LSB - 5: program is not installed.
+      log_end_msg 5
+      exit 5
+      ;;
+    esac
+  fi
 
-  case "$1" in
-  status)
-    # LSB - 4: program or service status is unknown.
-    log_end_msg 4
-    exit 4
-    ;;
-  *)
-    # LSB - 5: program is not installed.
-    log_end_msg 5
-    exit 5
-    ;;
-  esac
 fi
 
-if [ "$RUN" != "yes" ] ; then
-  log_failure_msg "$DESC ($NAME) not yet configured. Set RUN=yes in /etc/default/$NAME."
-  exit 0
-fi
 
 PIDFILE="${HOMEDIR}/${PIDFILE_NAME}"
 OPTIONS="-P ${PIDFILE}"
@@ -147,14 +138,13 @@ case "$1" in
       --name $NAME
     res=$?
 
-    # Posix MQueue for syslogging is created with owner root (to ensure
-    # rlimits and so) so it cannot be deleted by $USER when stopping the
-    # server. This command removes the mqueue when performing the "stop"
-    # action.
-    $DAEMON --remove-mqueue "/${NAME}_syslogger"
-
     if [ $res -eq 0 ] ; then
       log_end_msg 0
+      # Posix MQueue for syslogging is created with owner root (to ensure
+      # rlimits and so) so it cannot be deleted by a non root user when
+      # stopping the server. This command removes the mqueue when performing
+      # the "stop" action.
+      $DAEMON --remove-mqueue "/${NAME}_syslogger" 2>/dev/null
       exit 0
     else
       log_failure_msg "error, failed to stop."
@@ -200,4 +190,5 @@ case "$1" in
     log_failure_msg "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload|status}."
     exit 1
     ;;
+
 esac

data/debian/postinst

@@ -1,7 +1,12 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 
+
+#DEBHELPER#
+
+OVERSIP_GEM_VERSION="~>1.0.0"
+
 # summary of how this script can be called:
 #        * <postinst> `configure' <most-recently-configured-version>
 #        * <old-postinst> `abort-upgrade' <new version>
@@ -21,19 +26,26 @@ set -e
 #     `abort-remove' or `abort-deconfigure'.
 
 case "$1" in
-    configure)
-      adduser --quiet --system --group --disabled-password \
-              --shell /bin/false --gecos "OverSIP" \
-              --home /var/run/oversip oversip || true
-      ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-      ;;
-
-    *)
-      echo "postinst called with unknown argument \`$1'" >&2
-      exit 1
-      ;;
+  configure)
+    # Add a Debian system user/group called "oversip".
+    adduser --quiet --system --group --disabled-password \
+            --shell /bin/false --gecos "OverSIP" \
+            --home /var/run/oversip oversip || true
+
+    # Install the Ruby gem.
+    echo "installing 'oversip' Ruby Gem (version $OVERSIP_GEM_VERSION)..."
+    gem1.9.1 install oversip --no-rdoc --no-ri --conservative -v $OVERSIP_GEM_VERSION
+    ;;
+
+  abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+  *)
+    echo "postinst called with unknown argument \`$1'" >&2
+    exit 1
+    ;;
 esac
 
+exit 0
+
 #DEBHELPER#

data/debian/postrm

@@ -1,10 +1,16 @@
-#!/bin/sh
+#!/bin/bash
 
 #DEBHELPER#
 
 if [ "$1" = "purge" ] ; then
-  # remove user/group on purge
+  # Remove the Debian system user/group.
   deluser --quiet --remove-home oversip &>/dev/null || true
+
+  # Remove the Ruby gem.
+  echo "uninstalling 'oversip' Ruby Gem..."
+  gem1.9.1 uninstall oversip -a -x
 fi
 
 exit 0
+
+#DEBHELPER#

data/etc/oversip.conf

@@ -19,7 +19,7 @@ core:
   # - _null_: nameservers in /etc/resolv.conf are used.
   # Default value is _null_.
   #
-  nameservers: 127.0.0.1
+  nameservers: null
 
   # Syslog facility. Can be "user", "local0"..."local7".
   # By default "user".

data/lib/oversip/master_process.rb

@@ -12,7 +12,6 @@ require "openssl"
 
 gem "eventmachine-le", ">= 1.1.0"
 require "eventmachine-le"
-
 gem "iobuffer", ">= 1.1.2"
 require "iobuffer"
 gem "em-udns", ">= 0.3.6"

data/lib/oversip/syslogger_process.rb

@@ -7,10 +7,10 @@ require "syslog"
 
 gem "eventmachine-le", ">= 1.1.0"
 require "eventmachine-le"
-
 gem "em-posixmq", ">= 0.2.3"
 require "em-posixmq"
 
+
 # OverSIP libraries.
 # (not required to be loaded as needed ones have been already
 # loaded before forking).

data/lib/oversip/version.rb

@@ -3,9 +3,9 @@
 module OverSIP
 
   module Version
-    MAJOR = 0
-    MINOR = 9
-    TINY  = 1
+    MAJOR = 1
+    MINOR = 0
+    TINY  = 0
   end
 
   PROGRAM_NAME     = "OverSIP"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oversip
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-11 00:00:00.000000000 Z
+date: 2012-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine-le
-  requirement: &13397980 !ruby/object:Gem::Requirement
+  requirement: &18605540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *13397980
+  version_requirements: *18605540
 - !ruby/object:Gem::Dependency
   name: iobuffer
-  requirement: &13397340 !ruby/object:Gem::Requirement
+  requirement: &18605080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *13397340
+  version_requirements: *18605080
 - !ruby/object:Gem::Dependency
   name: em-posixmq
-  requirement: &13396680 !ruby/object:Gem::Requirement
+  requirement: &18604620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *13396680
+  version_requirements: *18604620
 - !ruby/object:Gem::Dependency
   name: em-udns
-  requirement: &13396180 !ruby/object:Gem::Requirement
+  requirement: &18604160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *13396180
+  version_requirements: *18604160
 - !ruby/object:Gem::Dependency
   name: escape_utils
-  requirement: &13395700 !ruby/object:Gem::Requirement
+  requirement: &18603700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *13395700
+  version_requirements: *18603700
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &13395320 !ruby/object:Gem::Requirement
+  requirement: &18603320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13395320
+  version_requirements: *18603320
 - !ruby/object:Gem::Dependency
   name: posix-spawn
-  requirement: &13394720 !ruby/object:Gem::Requirement
+  requirement: &18602860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13394720
+  version_requirements: *18602860
 description: ! "OverSIP is an async SIP server. Built on top of Ruby EventMachine\n
   \   library it follows the Reactor Pattern, allowing thousands of concurrent connections
   and requests\n    handled by a single processor in a never-blocking fashion. It