oversip 1.0.3 → 1.0.4

data/debian/oversip.default

@@ -10,3 +10,16 @@ USER=oversip
 
 # Group to run as.
 GROUP=oversip
+
+# Directory with the configuration files.
+# By default '/etc/oversip/'.
+#CONFIG_DIR=/etc/oversip/
+
+# Main configuration file name (within the configuration directory).
+# By default 'oversip.conf'.
+#CONFIG_FILE=oversip.conf
+
+# Number of OverSIP instances that will run together in this host.
+# This parameter is just for some resources allocation, it does not run N instances!
+# By default 1.
+#NUM_INSTANCES=1

data/debian/oversip.init

@@ -11,14 +11,16 @@
 ### END INIT INFO
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/var/lib/gems/1.9.1/bin
-NAME=oversip
 DESC=OverSIP
-HOMEDIR=/var/run/$NAME
-PIDFILE_NAME=$NAME.pid
+HOMEDIR=/var/run/oversip
 RUN=no
-RUBY_GEM=$NAME
+RUBY_GEM=oversip
 RUBY_EXE=ruby1.9.1
 
+# Process name, it affects to the process name, Posix Message Queue name and PID file.
+# The configuration file under /etc/default/ to read will also be called $NAME.
+NAME=oversip
+
 
 . /lib/lsb/init-functions
 
@@ -30,53 +32,51 @@ UBUNTU_LOGGING=0
 [ -r /etc/default/$NAME ] && . /etc/default/$NAME
 
 
-# Checks for the start action.
+# Check for the start/restart/force-reload actions.
 if [ "$1" == "start" ] || [ "$1" == "restart" ] || [ "$1" == "force-reload" ] ; then
-
   # 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
+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
-  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."
+# 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
 
-    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
+# Check whether OverSIP Ruby Gem is installed and get the executable location.
+DAEMON=$(which oversip)
+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
 
 
-PIDFILE="${HOMEDIR}/${PIDFILE_NAME}"
-OPTIONS="-P ${PIDFILE}"
-if [ -n "$USER" ] ; then
- OPTIONS="${OPTIONS} -u ${USER}"
-fi
-if [ -n "$GROUP" ] ; then
- OPTIONS="${OPTIONS} -g ${GROUP}"
-fi
+PIDFILE="${HOMEDIR}/${NAME}.pid"
+OPTIONS="-P ${PIDFILE} -p ${NAME}"
+
+if [ -n "$USER" ]          ; then  OPTIONS="${OPTIONS} -u ${USER}"                       ; fi
+if [ -n "$GROUP" ]         ; then  OPTIONS="${OPTIONS} -g ${GROUP}"                      ; fi
+if [ -n "$CONFIG_DIR" ]    ; then  OPTIONS="${OPTIONS} --config-dir ${CONFIG_DIR}"       ; fi
+if [ -n "$CONFIG_FILE" ]   ; then  OPTIONS="${OPTIONS} --config-file ${CONFIG_FILE}"     ; fi
+if [ -n "$NUM_INSTANCES" ] ; then  OPTIONS="${OPTIONS} --num-instances ${NUM_INSTANCES}" ; fi
 
 
 check_homedir()
@@ -162,8 +162,7 @@ case "$1" in
     echo
     set +e
 
-    start-stop-daemon --oknodo --stop --pidfile $PIDFILE --quiet \
-      --name $NAME
+    start-stop-daemon --oknodo --stop --pidfile $PIDFILE --quiet
     res=$?
 
     if [ $res -eq 0 ] ; then
@@ -186,8 +185,7 @@ case "$1" in
     echo
     set +e
 
-    start-stop-daemon --oknodo --stop --pidfile $PIDFILE --retry=5 --quiet \
-      --name $NAME
+    start-stop-daemon --oknodo --stop --pidfile $PIDFILE --retry=5 --quiet
 
     if [ $? -ne 0 ] ; then
       log_failure_msg "error, failed to stop."

data/debian/preinst

@@ -6,7 +6,7 @@ set -e
 
 #DEBHELPER#
 
-OVERSIP_GEM_VERSION="~>1.0.3"
+OVERSIP_GEM_VERSION="~>1.0.4"
 
 case "$1" in
 

data/lib/oversip/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oversip
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-25 00:00:00.000000000 Z
+date: 2012-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine-le
-  requirement: &13970320 !ruby/object:Gem::Requirement
+  requirement: &12671300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *13970320
+  version_requirements: *12671300
 - !ruby/object:Gem::Dependency
   name: iobuffer
-  requirement: &13969800 !ruby/object:Gem::Requirement
+  requirement: &12670760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *13969800
+  version_requirements: *12670760
 - !ruby/object:Gem::Dependency
   name: em-posixmq
-  requirement: &13969120 !ruby/object:Gem::Requirement
+  requirement: &12669960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *13969120
+  version_requirements: *12669960
 - !ruby/object:Gem::Dependency
   name: em-udns
-  requirement: &13968220 !ruby/object:Gem::Requirement
+  requirement: &12669120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *13968220
+  version_requirements: *12669120
 - !ruby/object:Gem::Dependency
   name: escape_utils
-  requirement: &13967120 !ruby/object:Gem::Requirement
+  requirement: &12667940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *13967120
+  version_requirements: *12667940
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &13966420 !ruby/object:Gem::Requirement
+  requirement: &12667360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13966420
+  version_requirements: *12667360
 - !ruby/object:Gem::Dependency
   name: posix-spawn
-  requirement: &13965860 !ruby/object:Gem::Requirement
+  requirement: &12666820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 0.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *13965860
+  version_requirements: *12666820
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &13965060 !ruby/object:Gem::Requirement
+  requirement: &12665940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *13965060
+  version_requirements: *12665940
 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