OpenPKG Specs: opensips/opensips.patch.ctlrc@a2c6460cfb16 (annotated)

opensips/opensips.patch.ctlrc@a2c6460cfb16 (annotated)

opensips/opensips.patch.ctlrc

Mon, 28 Jan 2013 17:37:18 +0100

author: Michael Schloh von Bennewitz <michael@schloh.com>
date: Mon, 28 Jan 2013 17:37:18 +0100
changeset 758: a2c6460cfb16
parent 707: 005bcc1c949b
permissions: -rw-r--r--

Correct socket error reporting improvement with IPv6 portable code,
after helpful recommendation by Saúl Ibarra Corretgé on OSips devlist.

 Index: scripts/opensipsctlrc
 diff -Nau scripts/opensipsctlrc.orig scripts/opensipsctlrc
 --- scripts/opensipsctlrc.orig	2011-08-24 10:12:07.000000000 +0200
 +++ scripts/opensipsctlrc	2012-03-22 19:04:38.092856433 +0100
@@ -1,13 +1,9 @@
 -# $Id: opensipsctlrc 9049 2012-05-24 14:03:31Z osas $
 -#
 -# The OpenSIPS configuration file for the control tools.
 -#
 -# Here you can set variables used in the opensipsctl and opensipsdbctl setup
 -# scripts. Per default all variables here are commented out, the control tools
 -# will use their internal default values.
 +##
 +##  opensipsctlrc -- OpenSIPS control tools configuration
 +##
  ## your SIP domain
 -# SIP_DOMAIN=opensips.org
 +# SIP_DOMAIN=name.host.tld
  ## chrooted directory
  # $CHROOT_DIR="/path/to/chrooted/directory"
@@ -18,6 +14,9 @@
  # this parameter.
  # DBENGINE=MYSQL
 +## Path to MySQL client
 +MYSQL=@l_prefix@/bin/mysql
 +
  ## database host
  # DBHOST=localhost
@@ -25,16 +24,22 @@
  # DBNAME=opensips
  # database path used by dbtext or db_berkeley
 -# DB_PATH="/usr/local/etc/opensips/dbtext"
 +DB_PATH=@l_prefix@/var/opensips/db
  ## database read/write user
 -# DBRWUSER=opensips
 +# DBRWUSER=@l_rusr@
  ## password for database read/write user
 -# DBRWPW="opensipsrw"
 +# DBRWPW=rente_word_pass_rw
 +
 +## database read only user
 +# DBROUSER=@l_rusr@
 +
 +## password for database read only user
 +# DBROPW=rentero_word_pass
  ## database super user (for ORACLE this is 'scheme-creator' user)
 -# DBROOTUSER="root"
 +# DBROOTUSER=@l_susr@
  # user name column
  # USERCOL="username"
@@ -43,7 +48,7 @@
  # SQL definitions
  # If you change this definitions here, then you must change them
  # in db/schema/entities.xml too.
 -# FIXME
 +#
  # FOREVER="2020-05-28 21:32:15"
  # DEFAULT_ALIASES_EXPIRES=$FOREVER
@@ -97,13 +102,16 @@
  ## control engine: FIFO or UNIXSOCK
  ## - default FIFO
 -# CTLENGINE=xmlrpc
 +CTLENGINE=FIFO
  ## path to FIFO file
 -# OSIPS_FIFO="/tmp/opensips_fifo"
 +OSIPS_FIFO=@l_prefix@/var/opensips/opensips.fifo
 +
 +## path to server inbound FIFO directory
 +OSER_FIRET=@l_prefix@/var/opensips
  ## MI_CONNECTOR control engine: FIFO, UNIXSOCK, UDP, XMLRPC
 -# MI_CONNECTOR=FIFO:/tmp/opensips_fifo
 +# MI_CONNECTOR=FIFO:@l_prefix@/var/opensips/opensips.fifo
  # MI_CONNECTOR=UNIXSOCK:/tmp/opensips.sock
  # MI_CONNECTOR=UDP:192.168.2.133:8000
  # MI_CONNECTOR=XMLRPC:192.168.2.133:8000
@@ -120,15 +128,16 @@
  ## do (1) or don't (0) store plaintext passwords
  ## in the subscriber table - default '1'
 -# STORE_PLAINTEXT_PW=0
 +STORE_PLAINTEXT_PW=0
  ## do not display the output highlighted
  # NOHLPRINT=1
  ## OPENSIPS START Options
 -## PID file path - default is: /var/run/opensips.pid
 -# PID_FILE=/var/run/opensips.pid
 +## PID file path - default is: @l_prefix@/var/opensips/opensips.pid
 +PID_FILE=@l_prefix@/var/opensips/opensips.pid
  ## Extra start options - default is: not set
  # example: start opensips with 64MB share memory: STARTOPTIONS="-m 64"
 +#          ...as opposed to the 32MB share memory default value in 1.7
  # STARTOPTIONS=
 Index: scripts/osipsconsolerc
 diff -Nau scripts/osipsconsolerc.orig scripts/osipsconsolerc
 --- scripts/osipsconsolerc.orig	2011-07-12 18:42:53.000000000 +0200
 +++ scripts/osipsconsolerc	2012-03-22 19:04:45.670384106 +0100
@@ -1,51 +1,56 @@
 -# $Id: osicpsconsolerc
 -#
 -# The OpenSIPS configuration file for the control tools.
 -#
 -# Here you can set variables used in the opensipsctl and opensipsdbctl setup
 -# scripts. Per default all variables here are commented out, the control tools
 -# will use their internal default values.
 +##
 +##  osipsconsolerc -- OpenSIPS management configuration
 +##
  ## your SIP domain
 -# SIP_DOMAIN=opensips.org
 +# SIP_DOMAIN=name.host.tld
  ## database type: MYSQL, PGSQL, ORACLE, DB_BERKELEY, or DBTEXT, by default none is loaded
  # If you want to setup a database with opensipsdbctl, you must at least specify
  # this parameter.
  # DBENGINE=MYSQL
 +## Path to MySQL client
 +MYSQL=@l_prefix@/bin/mysql
 +
  ## database host
  # DBHOST=localhost
 -## database port (PostgreSQL=5433 mandatory; MYSQL=3306 optional)
 -# DBPORT=3306
 +## database port for PostgreSQL
 +# DBPORT=5433
  ## database name (for ORACLE this is TNS name)
  # DBNAME=opensips
  ## database path used by dbtext or db_berkeley
 -# DB_PATH="/usr/local/etc/opensips/dbtext"
 +DB_PATH=@l_prefix@/var/opensips/db
  ## database read/write user
 -# DBRWUSER=opensips
 +# DBRWUSER=@l_rusr@
  ## password for database read/write user
 -# DBRWPW=opensipsrw
 +# DBRWPW=rente_word_pass_rw
 +
 +## database read only user
 +# DBROUSER=@l_rusr@
 +
 +## password for database read only user
 +# DBROPW=rentero_word_pass
  ## database super user (for ORACLE this is 'scheme-creator' user)
 -# DBROOTUSER=root
 +# DBROOTUSER=@l_susr@
 -# Program to calculate a message-digest fingerprint
 -# MD5=md5sum
 +# Program to calculate a message-digest fingerprint
 +# MD5="md5sum"
  # awk tool
 -# AWK=awk
 +# AWK="awk"
  # grep tool
 -# GREP=egrep
 +# GREP="egrep"
  # sed tool
 -# SED=sed
 +# SED="sed"
  # Describe what additional tables to install. Valid values for the variables
@@ -54,14 +59,15 @@
  #
  # Define what module tables should be installed.
 -# If you use the postgres database and want to change the installed tables, then you
 -# must also adjust the STANDARD_TABLES or EXTRA_TABLES variable accordingly in the
 -# opensipsdbctl.base script.
 +# If you use the postgres database and want to change the installed tables,
 +# then you must also adjust the STANDARD_TABLES or EXTRA_TABLES variable
 +# accordingly in the opensipsdbctl.base script.
  # opensips standard modules
 -# STANDARD_MODULES="standard acc domain group permissions registrar usrloc msilo
 -#                   alias_db uri_db speeddial avpops auth_db pdt dialog dispatcher
 -#                   dialplan drouting nathelper load_balancer"
 +# STANDARD_MODULES="standard acc domain group permissions registrar
 +#                   usrloc msilo alias_db uri_db speeddial avpops auth_db
 +#                   pdt dialog dispatcher dialplan drouting nathelper
 +#                   load_balancer"
  # opensips extra modules
  # EXTRA_MODULES="imc cpl siptrace domainpolicy carrierroute userblacklist"
@@ -69,10 +75,10 @@
  ## type of aliases used: DB - database aliases; UL - usrloc aliases
  ## - default: none
 -# ALIASES_TYPE=DB
 +# ALIASES_TYPE="DB"
  ## MI_CONNECTOR control engine: FIFO, UNIXSOCK, UDP, XMLRPC
 -# MI_CONNECTOR=FIFO:/tmp/opensips_fifo
 +# MI_CONNECTOR=FIFO:@l_prefix@/var/opensips/opensips.fifo
  # MI_CONNECTOR=UNIXSOCK:/tmp/opensips.sock
  # MI_CONNECTOR=UDP:192.168.2.133:8000
  # MI_CONNECTOR=XMLRPC:192.168.2.133:8000
@@ -80,22 +86,18 @@
  ## check ACL names; default on (1); off (0)
  # VERIFY_ACL=1
 -## ACL names - if VERIFY_ACL is set, only the ACL names from below list
 -## are accepted
 +## ACL names - if VERIFY_ACL is set, only ACL names from list are accepted
  # ACL_GROUPS="local ld int voicemail free-pstn"
  ## do (1) or don't (0) store plaintext passwords
  ## in the subscriber table - default '1'
 -# STORE_PLAINTEXT_PW=1
 +STORE_PLAINTEXT_PW=0
  ## OPENSIPS START Options
 -## PID file path - default is: /var/run/opensips.pid
 -# PID_FILE=/var/run/opensips.pid
 -
 -## OUTPUT control - default output is to SYSLOG
 -## 0=output to console, 1=output to syslog
 -# SYSLOG=0
 +## PID file path - default is: @l_prefix@/var/opensips/opensips.pid
 +PID_FILE=@l_prefix@/var/opensips/opensips.pid
  ## Extra start options - default is: not set
  # example: start opensips with 64MB share memory: STARTOPTIONS="-m 64"
 +#          ...as opposed to the 32MB share memory default value in 1.7
  # STARTOPTIONS=

OpenPKG Specs / annotate

opensips/opensips.patch.ctlrc@a2c6460cfb16 (annotated)

opensips/opensips.patch.ctlrc