# HG changeset patch # User Michael Schloh von Bennewitz # Date 1332446685 -3600 # Node ID 7cc1c5d3b5e758faffa0d6cbfa43634d019ec4e6 # Parent 751f89d647ed09055326cf216ee9941c687c31c7 Remove unintegrated ctlrc files and replace correction logic with a patch. diff -r 751f89d647ed -r 7cc1c5d3b5e7 opensips/opensips.patch.ctlrc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/opensips/opensips.patch.ctlrc Thu Mar 22 21:04:45 2012 +0100 @@ -0,0 +1,253 @@ +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,22 +1,16 @@ +-# $Id: opensipsctlrc 8290 2011-08-23 14:14:10Z razvancrainea $ +-# +-# 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" + +-## 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 ++## Database type: MYSQL, PGSQL, ORACLE, DB_BERKELEY, or DBTEXT; ++## by default none is loaded. Use opensipsdbctl to setup a database. ++DBENGINE=DBTEXT + + ## database host + # DBHOST=localhost +@@ -25,16 +19,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 +43,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 +97,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 +123,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,52 @@ +-# $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 ++## Database type: MYSQL, PGSQL, ORACLE, DB_BERKELEY, or DBTEXT; ++## by default none is loaded. Use opensipsdbctl to setup a database. ++DBENGINE=DBTEXT + + ## 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 +55,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 +71,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 +82,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= diff -r 751f89d647ed -r 7cc1c5d3b5e7 opensips/opensipsctlrc --- a/opensips/opensipsctlrc Thu Mar 22 21:02:46 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,135 +0,0 @@ -## -## opensipsctlrc -- OpenSIPS control tools configuration -## - -## your SIP domain -SIP_DOMAIN=name.host.tld - -## chrooted directory -# $CHROOT_DIR="/path/to/chrooted/directory" - -## Database type: MYSQL, PGSQL, ORACLE, DB_BERKELEY, or DBTEXT; -## by default none is loaded. Use opensipsdbctl to setup a database. -DBENGINE=DBTEXT - -## database host -# DBHOST=localhost - -## database name (for ORACLE this is TNS name) -# DBNAME=opensips - -# database path used by dbtext or db_berkeley -DB_PATH=@l_prefix@/var/opensips/db - -## database read/write user -# DBRWUSER=@l_rusr@ - -## password for database read/write user -# 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=@l_susr@ - -# user name column -# USERCOL="username" - - -# SQL definitions -# If you change this definitions here, then you must change them -# in db/schema/entities.xml too. -# - -# FOREVER="2020-05-28 21:32:15" -# DEFAULT_ALIASES_EXPIRES=$FOREVER -# DEFAULT_Q="1.0" -# DEFAULT_CALLID="Default-Call-ID" -# DEFAULT_CSEQ="13" -# DEFAULT_LOCATION_EXPIRES=$FOREVER - - -# Program to calculate a message-digest fingerprint -# MD5="md5sum" - -# awk tool -# AWK="awk" - -# grep tool -# GREP="grep" - -# sed tool -# SED="sed" - - -# Describe what additional tables to install. Valid values for the variables -# below are yes/no/ask. With ask (default) it will interactively ask the user -# for an answer, while yes/no allow for automated, unassisted installs. -# - -# If to install tables for the modules in the EXTRA_MODULES variable. -# INSTALL_EXTRA_TABLES=ask - -# If to install presence related tables. -# INSTALL_PRESENCE_TABLES=ask - -# 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. - -# 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" - -# opensips extra modules -# EXTRA_MODULES="imc cpl siptrace domainpolicy carrierroute userblacklist" - - -## type of aliases used: DB - database aliases; UL - usrloc aliases -## - default: none -# ALIASES_TYPE="DB" - -## control engine: FIFO or UNIXSOCK -## - default FIFO -CTLENGINE=FIFO - -## path to FIFO file -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:@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 - -## 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_GROUPS="local ld int voicemail free-pstn" - -## verbose - debug purposes - default '0' -# VERBOSE=1 - -## do (1) or don't (0) store plaintext passwords -## in the subscriber table - default '1' -STORE_PLAINTEXT_PW=0 - -## OPENSIPS START Options -## PID file path - default is: /var/run/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= diff -r 751f89d647ed -r 7cc1c5d3b5e7 opensips/osipsconsolerc --- a/opensips/osipsconsolerc Thu Mar 22 21:02:46 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,99 +0,0 @@ -## -## osipsconsolerc -- OpenSIPS management configuration -## - -## your SIP domain -SIP_DOMAIN=name.host.tld - -## Database type: MYSQL, PGSQL, ORACLE, DB_BERKELEY, or DBTEXT; -## by default none is loaded. Use opensipsdbctl to setup a database. -DBENGINE=DBTEXT - -## database host -# DBHOST=localhost - -## 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=@l_prefix@/var/opensips/db - -## database read/write user -# DBRWUSER=@l_rusr@ - -## password for database read/write user -# 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=@l_susr@ - -# Program to calculate a message-digest fingerprint -# MD5="md5sum" - -# awk tool -# AWK="awk" - -# grep tool -# GREP="egrep" - -# sed tool -# SED="sed" - - -# Describe what additional tables to install. Valid values for the variables -# below are yes/no/ask. With ask (default) it will interactively ask the user -# for an answer, while yes/no allow for automated, unassisted installs. -# - -# 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. - -# 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" - -# opensips extra modules -# EXTRA_MODULES="imc cpl siptrace domainpolicy carrierroute userblacklist" - - -## type of aliases used: DB - database aliases; UL - usrloc aliases -## - default: none -# ALIASES_TYPE="DB" - -## MI_CONNECTOR control engine: FIFO, UNIXSOCK, UDP, XMLRPC -# 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 - -## check ACL names; default on (1); off (0) -# VERIFY_ACL=1 - -## 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=0 - -## OPENSIPS START Options -## PID file path - default is: /var/run/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=