Thu, 22 Mar 2012 21:04:45 +0100
Remove unintegrated ctlrc files and replace correction logic with a patch.
opensips/opensips.patch.ctlrc | file | annotate | diff | comparison | revisions | |
opensips/opensipsctlrc | file | annotate | diff | comparison | revisions | |
opensips/osipsconsolerc | file | annotate | diff | comparison | revisions |
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=
2.1 --- a/opensips/opensipsctlrc Thu Mar 22 21:02:46 2012 +0100 2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 2.3 @@ -1,135 +0,0 @@ 2.4 -## 2.5 -## opensipsctlrc -- OpenSIPS control tools configuration 2.6 -## 2.7 - 2.8 -## your SIP domain 2.9 -SIP_DOMAIN=name.host.tld 2.10 - 2.11 -## chrooted directory 2.12 -# $CHROOT_DIR="/path/to/chrooted/directory" 2.13 - 2.14 -## Database type: MYSQL, PGSQL, ORACLE, DB_BERKELEY, or DBTEXT; 2.15 -## by default none is loaded. Use opensipsdbctl to setup a database. 2.16 -DBENGINE=DBTEXT 2.17 - 2.18 -## database host 2.19 -# DBHOST=localhost 2.20 - 2.21 -## database name (for ORACLE this is TNS name) 2.22 -# DBNAME=opensips 2.23 - 2.24 -# database path used by dbtext or db_berkeley 2.25 -DB_PATH=@l_prefix@/var/opensips/db 2.26 - 2.27 -## database read/write user 2.28 -# DBRWUSER=@l_rusr@ 2.29 - 2.30 -## password for database read/write user 2.31 -# DBRWPW=rente_word_pass_rw 2.32 - 2.33 -## database read only user 2.34 -# DBROUSER=@l_rusr@ 2.35 - 2.36 -## password for database read only user 2.37 -# DBROPW=rentero_word_pass 2.38 - 2.39 -## database super user (for ORACLE this is 'scheme-creator' user) 2.40 -# DBROOTUSER=@l_susr@ 2.41 - 2.42 -# user name column 2.43 -# USERCOL="username" 2.44 - 2.45 - 2.46 -# SQL definitions 2.47 -# If you change this definitions here, then you must change them 2.48 -# in db/schema/entities.xml too. 2.49 -# 2.50 - 2.51 -# FOREVER="2020-05-28 21:32:15" 2.52 -# DEFAULT_ALIASES_EXPIRES=$FOREVER 2.53 -# DEFAULT_Q="1.0" 2.54 -# DEFAULT_CALLID="Default-Call-ID" 2.55 -# DEFAULT_CSEQ="13" 2.56 -# DEFAULT_LOCATION_EXPIRES=$FOREVER 2.57 - 2.58 - 2.59 -# Program to calculate a message-digest fingerprint 2.60 -# MD5="md5sum" 2.61 - 2.62 -# awk tool 2.63 -# AWK="awk" 2.64 - 2.65 -# grep tool 2.66 -# GREP="grep" 2.67 - 2.68 -# sed tool 2.69 -# SED="sed" 2.70 - 2.71 - 2.72 -# Describe what additional tables to install. Valid values for the variables 2.73 -# below are yes/no/ask. With ask (default) it will interactively ask the user 2.74 -# for an answer, while yes/no allow for automated, unassisted installs. 2.75 -# 2.76 - 2.77 -# If to install tables for the modules in the EXTRA_MODULES variable. 2.78 -# INSTALL_EXTRA_TABLES=ask 2.79 - 2.80 -# If to install presence related tables. 2.81 -# INSTALL_PRESENCE_TABLES=ask 2.82 - 2.83 -# Define what module tables should be installed. 2.84 -# If you use the postgres database and want to change the installed tables, 2.85 -# then you must also adjust the STANDARD_TABLES or EXTRA_TABLES variable 2.86 -# accordingly in the opensipsdbctl.base script. 2.87 - 2.88 -# opensips standard modules 2.89 -# STANDARD_MODULES="standard acc domain group permissions registrar usrloc 2.90 -# msilo alias_db uri_db speeddial avpops auth_db pdt dialog 2.91 -# dispatcher dialplan drouting nathelper load_balancer" 2.92 - 2.93 -# opensips extra modules 2.94 -# EXTRA_MODULES="imc cpl siptrace domainpolicy carrierroute userblacklist" 2.95 - 2.96 - 2.97 -## type of aliases used: DB - database aliases; UL - usrloc aliases 2.98 -## - default: none 2.99 -# ALIASES_TYPE="DB" 2.100 - 2.101 -## control engine: FIFO or UNIXSOCK 2.102 -## - default FIFO 2.103 -CTLENGINE=FIFO 2.104 - 2.105 -## path to FIFO file 2.106 -OSIPS_FIFO=@l_prefix@/var/opensips/opensips.fifo 2.107 - 2.108 -## path to server inbound FIFO directory 2.109 -OSER_FIRET=@l_prefix@/var/opensips 2.110 - 2.111 -## MI_CONNECTOR control engine: FIFO, UNIXSOCK, UDP, XMLRPC 2.112 -# MI_CONNECTOR=FIFO:@l_prefix@/var/opensips/opensips.fifo 2.113 -# MI_CONNECTOR=UNIXSOCK:/tmp/opensips.sock 2.114 -# MI_CONNECTOR=UDP:192.168.2.133:8000 2.115 -# MI_CONNECTOR=XMLRPC:192.168.2.133:8000 2.116 - 2.117 -## check ACL names; default on (1); off (0) 2.118 -# VERIFY_ACL=1 2.119 - 2.120 -## ACL names - if VERIFY_ACL is set, only the ACL names from below list 2.121 -## are accepted 2.122 -# ACL_GROUPS="local ld int voicemail free-pstn" 2.123 - 2.124 -## verbose - debug purposes - default '0' 2.125 -# VERBOSE=1 2.126 - 2.127 -## do (1) or don't (0) store plaintext passwords 2.128 -## in the subscriber table - default '1' 2.129 -STORE_PLAINTEXT_PW=0 2.130 - 2.131 -## OPENSIPS START Options 2.132 -## PID file path - default is: /var/run/opensips.pid 2.133 -PID_FILE=@l_prefix@/var/opensips/opensips.pid 2.134 - 2.135 -## Extra start options - default is: not set 2.136 -# example: start opensips with 64MB share memory: STARTOPTIONS="-m 64" 2.137 -# ...as opposed to the 32MB share memory default value in 1.7 2.138 -# STARTOPTIONS=
3.1 --- a/opensips/osipsconsolerc Thu Mar 22 21:02:46 2012 +0100 3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 3.3 @@ -1,99 +0,0 @@ 3.4 -## 3.5 -## osipsconsolerc -- OpenSIPS management configuration 3.6 -## 3.7 - 3.8 -## your SIP domain 3.9 -SIP_DOMAIN=name.host.tld 3.10 - 3.11 -## Database type: MYSQL, PGSQL, ORACLE, DB_BERKELEY, or DBTEXT; 3.12 -## by default none is loaded. Use opensipsdbctl to setup a database. 3.13 -DBENGINE=DBTEXT 3.14 - 3.15 -## database host 3.16 -# DBHOST=localhost 3.17 - 3.18 -## database port for PostgreSQL 3.19 -# DBPORT=5433 3.20 - 3.21 -## database name (for ORACLE this is TNS name) 3.22 -# DBNAME=opensips 3.23 - 3.24 -## database path used by dbtext or db_berkeley 3.25 -DB_PATH=@l_prefix@/var/opensips/db 3.26 - 3.27 -## database read/write user 3.28 -# DBRWUSER=@l_rusr@ 3.29 - 3.30 -## password for database read/write user 3.31 -# DBRWPW=rente_word_pass_rw 3.32 - 3.33 -## database read only user 3.34 -# DBROUSER=@l_rusr@ 3.35 - 3.36 -## password for database read only user 3.37 -# DBROPW=rentero_word_pass 3.38 - 3.39 -## database super user (for ORACLE this is 'scheme-creator' user) 3.40 -# DBROOTUSER=@l_susr@ 3.41 - 3.42 -# Program to calculate a message-digest fingerprint 3.43 -# MD5="md5sum" 3.44 - 3.45 -# awk tool 3.46 -# AWK="awk" 3.47 - 3.48 -# grep tool 3.49 -# GREP="egrep" 3.50 - 3.51 -# sed tool 3.52 -# SED="sed" 3.53 - 3.54 - 3.55 -# Describe what additional tables to install. Valid values for the variables 3.56 -# below are yes/no/ask. With ask (default) it will interactively ask the user 3.57 -# for an answer, while yes/no allow for automated, unassisted installs. 3.58 -# 3.59 - 3.60 -# Define what module tables should be installed. 3.61 -# If you use the postgres database and want to change the installed tables, 3.62 -# then you must also adjust the STANDARD_TABLES or EXTRA_TABLES variable 3.63 -# accordingly in the opensipsdbctl.base script. 3.64 - 3.65 -# opensips standard modules 3.66 -# STANDARD_MODULES="standard acc domain group permissions registrar 3.67 -# usrloc msilo alias_db uri_db speeddial avpops auth_db 3.68 -# pdt dialog dispatcher dialplan drouting nathelper 3.69 -# load_balancer" 3.70 - 3.71 -# opensips extra modules 3.72 -# EXTRA_MODULES="imc cpl siptrace domainpolicy carrierroute userblacklist" 3.73 - 3.74 - 3.75 -## type of aliases used: DB - database aliases; UL - usrloc aliases 3.76 -## - default: none 3.77 -# ALIASES_TYPE="DB" 3.78 - 3.79 -## MI_CONNECTOR control engine: FIFO, UNIXSOCK, UDP, XMLRPC 3.80 -# MI_CONNECTOR=FIFO:@l_prefix@/var/opensips/opensips.fifo 3.81 -# MI_CONNECTOR=UNIXSOCK:/tmp/opensips.sock 3.82 -# MI_CONNECTOR=UDP:192.168.2.133:8000 3.83 -# MI_CONNECTOR=XMLRPC:192.168.2.133:8000 3.84 - 3.85 -## check ACL names; default on (1); off (0) 3.86 -# VERIFY_ACL=1 3.87 - 3.88 -## ACL names - if VERIFY_ACL is set, only ACL names from list are accepted 3.89 -# ACL_GROUPS="local ld int voicemail free-pstn" 3.90 - 3.91 -## do (1) or don't (0) store plaintext passwords 3.92 -## in the subscriber table - default '1' 3.93 -STORE_PLAINTEXT_PW=0 3.94 - 3.95 -## OPENSIPS START Options 3.96 -## PID file path - default is: /var/run/opensips.pid 3.97 -PID_FILE=@l_prefix@/var/opensips/opensips.pid 3.98 - 3.99 -## Extra start options - default is: not set 3.100 -# example: start opensips with 64MB share memory: STARTOPTIONS="-m 64" 3.101 -# ...as opposed to the 32MB share memory default value in 1.7 3.102 -# STARTOPTIONS=