1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/opensips/opensips.patch.ctlrc Thu Mar 22 21:04:45 2012 +0100
1.3 @@ -0,0 +1,253 @@
1.4 +Index: scripts/opensipsctlrc
1.5 +diff -Nau scripts/opensipsctlrc.orig scripts/opensipsctlrc
1.6 +--- scripts/opensipsctlrc.orig 2011-08-24 10:12:07.000000000 +0200
1.7 ++++ scripts/opensipsctlrc 2012-03-22 19:04:38.092856433 +0100
1.8 +@@ -1,22 +1,16 @@
1.9 +-# $Id: opensipsctlrc 8290 2011-08-23 14:14:10Z razvancrainea $
1.10 +-#
1.11 +-# The OpenSIPS configuration file for the control tools.
1.12 +-#
1.13 +-# Here you can set variables used in the opensipsctl and opensipsdbctl setup
1.14 +-# scripts. Per default all variables here are commented out, the control tools
1.15 +-# will use their internal default values.
1.16 ++##
1.17 ++## opensipsctlrc -- OpenSIPS control tools configuration
1.18 ++##
1.19 +
1.20 + ## your SIP domain
1.21 +-# SIP_DOMAIN=opensips.org
1.22 ++# SIP_DOMAIN=name.host.tld
1.23 +
1.24 + ## chrooted directory
1.25 + # $CHROOT_DIR="/path/to/chrooted/directory"
1.26 +
1.27 +-## database type: MYSQL, PGSQL, ORACLE, DB_BERKELEY, or DBTEXT,
1.28 +-## by default none is loaded
1.29 +-# If you want to setup a database with opensipsdbctl, you must at least specify
1.30 +-# this parameter.
1.31 +-# DBENGINE=MYSQL
1.32 ++## Database type: MYSQL, PGSQL, ORACLE, DB_BERKELEY, or DBTEXT;
1.33 ++## by default none is loaded. Use opensipsdbctl to setup a database.
1.34 ++DBENGINE=DBTEXT
1.35 +
1.36 + ## database host
1.37 + # DBHOST=localhost
1.38 +@@ -25,16 +19,22 @@
1.39 + # DBNAME=opensips
1.40 +
1.41 + # database path used by dbtext or db_berkeley
1.42 +-# DB_PATH="/usr/local/etc/opensips/dbtext"
1.43 ++DB_PATH=@l_prefix@/var/opensips/db
1.44 +
1.45 + ## database read/write user
1.46 +-# DBRWUSER=opensips
1.47 ++# DBRWUSER=@l_rusr@
1.48 +
1.49 + ## password for database read/write user
1.50 +-# DBRWPW="opensipsrw"
1.51 ++# DBRWPW=rente_word_pass_rw
1.52 ++
1.53 ++## database read only user
1.54 ++# DBROUSER=@l_rusr@
1.55 ++
1.56 ++## password for database read only user
1.57 ++# DBROPW=rentero_word_pass
1.58 +
1.59 + ## database super user (for ORACLE this is 'scheme-creator' user)
1.60 +-# DBROOTUSER="root"
1.61 ++# DBROOTUSER=@l_susr@
1.62 +
1.63 + # user name column
1.64 + # USERCOL="username"
1.65 +@@ -43,7 +43,7 @@
1.66 + # SQL definitions
1.67 + # If you change this definitions here, then you must change them
1.68 + # in db/schema/entities.xml too.
1.69 +-# FIXME
1.70 ++#
1.71 +
1.72 + # FOREVER="2020-05-28 21:32:15"
1.73 + # DEFAULT_ALIASES_EXPIRES=$FOREVER
1.74 +@@ -97,13 +97,16 @@
1.75 +
1.76 + ## control engine: FIFO or UNIXSOCK
1.77 + ## - default FIFO
1.78 +-# CTLENGINE=xmlrpc
1.79 ++CTLENGINE=FIFO
1.80 +
1.81 + ## path to FIFO file
1.82 +-# OSIPS_FIFO="/tmp/opensips_fifo"
1.83 ++OSIPS_FIFO=@l_prefix@/var/opensips/opensips.fifo
1.84 ++
1.85 ++## path to server inbound FIFO directory
1.86 ++OSER_FIRET=@l_prefix@/var/opensips
1.87 +
1.88 + ## MI_CONNECTOR control engine: FIFO, UNIXSOCK, UDP, XMLRPC
1.89 +-# MI_CONNECTOR=FIFO:/tmp/opensips_fifo
1.90 ++# MI_CONNECTOR=FIFO:@l_prefix@/var/opensips/opensips.fifo
1.91 + # MI_CONNECTOR=UNIXSOCK:/tmp/opensips.sock
1.92 + # MI_CONNECTOR=UDP:192.168.2.133:8000
1.93 + # MI_CONNECTOR=XMLRPC:192.168.2.133:8000
1.94 +@@ -120,15 +123,16 @@
1.95 +
1.96 + ## do (1) or don't (0) store plaintext passwords
1.97 + ## in the subscriber table - default '1'
1.98 +-# STORE_PLAINTEXT_PW=0
1.99 ++STORE_PLAINTEXT_PW=0
1.100 +
1.101 + ## do not display the output highlighted
1.102 + # NOHLPRINT=1
1.103 +
1.104 + ## OPENSIPS START Options
1.105 +-## PID file path - default is: /var/run/opensips.pid
1.106 +-# PID_FILE=/var/run/opensips.pid
1.107 ++## PID file path - default is: @l_prefix@/var/opensips/opensips.pid
1.108 ++PID_FILE=@l_prefix@/var/opensips/opensips.pid
1.109 +
1.110 + ## Extra start options - default is: not set
1.111 + # example: start opensips with 64MB share memory: STARTOPTIONS="-m 64"
1.112 ++# ...as opposed to the 32MB share memory default value in 1.7
1.113 + # STARTOPTIONS=
1.114 +Index: scripts/osipsconsolerc
1.115 +diff -Nau scripts/osipsconsolerc.orig scripts/osipsconsolerc
1.116 +--- scripts/osipsconsolerc.orig 2011-07-12 18:42:53.000000000 +0200
1.117 ++++ scripts/osipsconsolerc 2012-03-22 19:04:45.670384106 +0100
1.118 +@@ -1,51 +1,52 @@
1.119 +-# $Id: osicpsconsolerc
1.120 +-#
1.121 +-# The OpenSIPS configuration file for the control tools.
1.122 +-#
1.123 +-# Here you can set variables used in the opensipsctl and opensipsdbctl setup
1.124 +-# scripts. Per default all variables here are commented out, the control tools
1.125 +-# will use their internal default values.
1.126 ++##
1.127 ++## osipsconsolerc -- OpenSIPS management configuration
1.128 ++##
1.129 +
1.130 + ## your SIP domain
1.131 +-# SIP_DOMAIN=opensips.org
1.132 ++# SIP_DOMAIN=name.host.tld
1.133 +
1.134 +-## database type: MYSQL, PGSQL, ORACLE, DB_BERKELEY, or DBTEXT, by default none is loaded
1.135 +-# If you want to setup a database with opensipsdbctl, you must at least specify
1.136 +-# this parameter.
1.137 +-# DBENGINE=MYSQL
1.138 ++## Database type: MYSQL, PGSQL, ORACLE, DB_BERKELEY, or DBTEXT;
1.139 ++## by default none is loaded. Use opensipsdbctl to setup a database.
1.140 ++DBENGINE=DBTEXT
1.141 +
1.142 + ## database host
1.143 + # DBHOST=localhost
1.144 +
1.145 +-## database port (PostgreSQL=5433 mandatory; MYSQL=3306 optional)
1.146 +-# DBPORT=3306
1.147 ++## database port for PostgreSQL
1.148 ++# DBPORT=5433
1.149 +
1.150 + ## database name (for ORACLE this is TNS name)
1.151 + # DBNAME=opensips
1.152 +
1.153 + ## database path used by dbtext or db_berkeley
1.154 +-# DB_PATH="/usr/local/etc/opensips/dbtext"
1.155 ++DB_PATH=@l_prefix@/var/opensips/db
1.156 +
1.157 + ## database read/write user
1.158 +-# DBRWUSER=opensips
1.159 ++# DBRWUSER=@l_rusr@
1.160 +
1.161 + ## password for database read/write user
1.162 +-# DBRWPW=opensipsrw
1.163 ++# DBRWPW=rente_word_pass_rw
1.164 ++
1.165 ++## database read only user
1.166 ++# DBROUSER=@l_rusr@
1.167 ++
1.168 ++## password for database read only user
1.169 ++# DBROPW=rentero_word_pass
1.170 +
1.171 + ## database super user (for ORACLE this is 'scheme-creator' user)
1.172 +-# DBROOTUSER=root
1.173 ++# DBROOTUSER=@l_susr@
1.174 +
1.175 +-# Program to calculate a message-digest fingerprint
1.176 +-# MD5=md5sum
1.177 ++# Program to calculate a message-digest fingerprint
1.178 ++# MD5="md5sum"
1.179 +
1.180 + # awk tool
1.181 +-# AWK=awk
1.182 ++# AWK="awk"
1.183 +
1.184 + # grep tool
1.185 +-# GREP=egrep
1.186 ++# GREP="egrep"
1.187 +
1.188 + # sed tool
1.189 +-# SED=sed
1.190 ++# SED="sed"
1.191 +
1.192 +
1.193 + # Describe what additional tables to install. Valid values for the variables
1.194 +@@ -54,14 +55,15 @@
1.195 + #
1.196 +
1.197 + # Define what module tables should be installed.
1.198 +-# If you use the postgres database and want to change the installed tables, then you
1.199 +-# must also adjust the STANDARD_TABLES or EXTRA_TABLES variable accordingly in the
1.200 +-# opensipsdbctl.base script.
1.201 ++# If you use the postgres database and want to change the installed tables,
1.202 ++# then you must also adjust the STANDARD_TABLES or EXTRA_TABLES variable
1.203 ++# accordingly in the opensipsdbctl.base script.
1.204 +
1.205 + # opensips standard modules
1.206 +-# STANDARD_MODULES="standard acc domain group permissions registrar usrloc msilo
1.207 +-# alias_db uri_db speeddial avpops auth_db pdt dialog dispatcher
1.208 +-# dialplan drouting nathelper load_balancer"
1.209 ++# STANDARD_MODULES="standard acc domain group permissions registrar
1.210 ++# usrloc msilo alias_db uri_db speeddial avpops auth_db
1.211 ++# pdt dialog dispatcher dialplan drouting nathelper
1.212 ++# load_balancer"
1.213 +
1.214 + # opensips extra modules
1.215 + # EXTRA_MODULES="imc cpl siptrace domainpolicy carrierroute userblacklist"
1.216 +@@ -69,10 +71,10 @@
1.217 +
1.218 + ## type of aliases used: DB - database aliases; UL - usrloc aliases
1.219 + ## - default: none
1.220 +-# ALIASES_TYPE=DB
1.221 ++# ALIASES_TYPE="DB"
1.222 +
1.223 + ## MI_CONNECTOR control engine: FIFO, UNIXSOCK, UDP, XMLRPC
1.224 +-# MI_CONNECTOR=FIFO:/tmp/opensips_fifo
1.225 ++# MI_CONNECTOR=FIFO:@l_prefix@/var/opensips/opensips.fifo
1.226 + # MI_CONNECTOR=UNIXSOCK:/tmp/opensips.sock
1.227 + # MI_CONNECTOR=UDP:192.168.2.133:8000
1.228 + # MI_CONNECTOR=XMLRPC:192.168.2.133:8000
1.229 +@@ -80,22 +82,18 @@
1.230 + ## check ACL names; default on (1); off (0)
1.231 + # VERIFY_ACL=1
1.232 +
1.233 +-## ACL names - if VERIFY_ACL is set, only the ACL names from below list
1.234 +-## are accepted
1.235 ++## ACL names - if VERIFY_ACL is set, only ACL names from list are accepted
1.236 + # ACL_GROUPS="local ld int voicemail free-pstn"
1.237 +
1.238 + ## do (1) or don't (0) store plaintext passwords
1.239 + ## in the subscriber table - default '1'
1.240 +-# STORE_PLAINTEXT_PW=1
1.241 ++STORE_PLAINTEXT_PW=0
1.242 +
1.243 + ## OPENSIPS START Options
1.244 +-## PID file path - default is: /var/run/opensips.pid
1.245 +-# PID_FILE=/var/run/opensips.pid
1.246 +-
1.247 +-## OUTPUT control - default output is to SYSLOG
1.248 +-## 0=output to console, 1=output to syslog
1.249 +-# SYSLOG=0
1.250 ++## PID file path - default is: @l_prefix@/var/opensips/opensips.pid
1.251 ++PID_FILE=@l_prefix@/var/opensips/opensips.pid
1.252 +
1.253 + ## Extra start options - default is: not set
1.254 + # example: start opensips with 64MB share memory: STARTOPTIONS="-m 64"
1.255 ++# ...as opposed to the 32MB share memory default value in 1.7
1.256 + # STARTOPTIONS=
