opensips/opensips.patch.ctlrc

changeset 707
005bcc1c949b
parent 547
1c75a8bb0fec
child 708
1b957bfaea12
equal deleted inserted replaced
1:ab99547b9670 2:ed878c7a37b5
1 Index: scripts/opensipsctlrc 1 Index: scripts/opensipsctlrc
2 diff -Nau scripts/opensipsctlrc.orig scripts/opensipsctlrc 2 diff -Nau scripts/opensipsctlrc.orig scripts/opensipsctlrc
3 --- scripts/opensipsctlrc.orig 2011-08-24 10:12:07.000000000 +0200 3 --- scripts/opensipsctlrc.orig 2011-08-24 10:12:07.000000000 +0200
4 +++ scripts/opensipsctlrc 2012-03-22 19:04:38.092856433 +0100 4 +++ scripts/opensipsctlrc 2012-03-22 19:04:38.092856433 +0100
5 @@ -1,22 +1,16 @@ 5 @@ -1,22 +1,19 @@
6 -# $Id: opensipsctlrc 9049 2012-05-24 14:03:31Z osas $ 6 -# $Id: opensipsctlrc 9049 2012-05-24 14:03:31Z osas $
7 -# 7 -#
8 -# The OpenSIPS configuration file for the control tools. 8 -# The OpenSIPS configuration file for the control tools.
9 -# 9 -#
10 -# Here you can set variables used in the opensipsctl and opensipsdbctl setup 10 -# Here you can set variables used in the opensipsctl and opensipsdbctl setup
27 -# this parameter. 27 -# this parameter.
28 -# DBENGINE=MYSQL 28 -# DBENGINE=MYSQL
29 +## Database type: MYSQL, PGSQL, ORACLE, DB_BERKELEY, or DBTEXT; 29 +## Database type: MYSQL, PGSQL, ORACLE, DB_BERKELEY, or DBTEXT;
30 +## by default none is loaded. Use opensipsdbctl to setup a database. 30 +## by default none is loaded. Use opensipsdbctl to setup a database.
31 +DBENGINE=DBTEXT 31 +DBENGINE=DBTEXT
32 +
33 +## Path to MySQL client
34 +MYSQL=@l_prefix@/bin/mysql
32 35
33 ## database host 36 ## database host
34 # DBHOST=localhost 37 # DBHOST=localhost
35 @@ -25,16 +19,22 @@ 38 @@ -25,16 +22,22 @@
36 # DBNAME=opensips 39 # DBNAME=opensips
37 40
38 # database path used by dbtext or db_berkeley 41 # database path used by dbtext or db_berkeley
39 -# DB_PATH="/usr/local/etc/opensips/dbtext" 42 -# DB_PATH="/usr/local/etc/opensips/dbtext"
40 +DB_PATH=@l_prefix@/var/opensips/db 43 +DB_PATH=@l_prefix@/var/opensips/db
57 -# DBROOTUSER="root" 60 -# DBROOTUSER="root"
58 +# DBROOTUSER=@l_susr@ 61 +# DBROOTUSER=@l_susr@
59 62
60 # user name column 63 # user name column
61 # USERCOL="username" 64 # USERCOL="username"
62 @@ -43,7 +43,7 @@ 65 @@ -43,7 +46,7 @@
63 # SQL definitions 66 # SQL definitions
64 # If you change this definitions here, then you must change them 67 # If you change this definitions here, then you must change them
65 # in db/schema/entities.xml too. 68 # in db/schema/entities.xml too.
66 -# FIXME 69 -# FIXME
67 +# 70 +#
68 71
69 # FOREVER="2020-05-28 21:32:15" 72 # FOREVER="2020-05-28 21:32:15"
70 # DEFAULT_ALIASES_EXPIRES=$FOREVER 73 # DEFAULT_ALIASES_EXPIRES=$FOREVER
71 @@ -97,13 +97,16 @@ 74 @@ -97,13 +100,16 @@
72 75
73 ## control engine: FIFO or UNIXSOCK 76 ## control engine: FIFO or UNIXSOCK
74 ## - default FIFO 77 ## - default FIFO
75 -# CTLENGINE=xmlrpc 78 -# CTLENGINE=xmlrpc
76 +CTLENGINE=FIFO 79 +CTLENGINE=FIFO
86 -# MI_CONNECTOR=FIFO:/tmp/opensips_fifo 89 -# MI_CONNECTOR=FIFO:/tmp/opensips_fifo
87 +# MI_CONNECTOR=FIFO:@l_prefix@/var/opensips/opensips.fifo 90 +# MI_CONNECTOR=FIFO:@l_prefix@/var/opensips/opensips.fifo
88 # MI_CONNECTOR=UNIXSOCK:/tmp/opensips.sock 91 # MI_CONNECTOR=UNIXSOCK:/tmp/opensips.sock
89 # MI_CONNECTOR=UDP:192.168.2.133:8000 92 # MI_CONNECTOR=UDP:192.168.2.133:8000
90 # MI_CONNECTOR=XMLRPC:192.168.2.133:8000 93 # MI_CONNECTOR=XMLRPC:192.168.2.133:8000
91 @@ -120,15 +123,16 @@ 94 @@ -120,15 +126,16 @@
92 95
93 ## do (1) or don't (0) store plaintext passwords 96 ## do (1) or don't (0) store plaintext passwords
94 ## in the subscriber table - default '1' 97 ## in the subscriber table - default '1'
95 -# STORE_PLAINTEXT_PW=0 98 -# STORE_PLAINTEXT_PW=0
96 +STORE_PLAINTEXT_PW=0 99 +STORE_PLAINTEXT_PW=0
110 # STARTOPTIONS= 113 # STARTOPTIONS=
111 Index: scripts/osipsconsolerc 114 Index: scripts/osipsconsolerc
112 diff -Nau scripts/osipsconsolerc.orig scripts/osipsconsolerc 115 diff -Nau scripts/osipsconsolerc.orig scripts/osipsconsolerc
113 --- scripts/osipsconsolerc.orig 2011-07-12 18:42:53.000000000 +0200 116 --- scripts/osipsconsolerc.orig 2011-07-12 18:42:53.000000000 +0200
114 +++ scripts/osipsconsolerc 2012-03-22 19:04:45.670384106 +0100 117 +++ scripts/osipsconsolerc 2012-03-22 19:04:45.670384106 +0100
115 @@ -1,51 +1,52 @@ 118 @@ -1,51 +1,55 @@
116 -# $Id: osicpsconsolerc 119 -# $Id: osicpsconsolerc
117 -# 120 -#
118 -# The OpenSIPS configuration file for the control tools. 121 -# The OpenSIPS configuration file for the control tools.
119 -# 122 -#
120 -# Here you can set variables used in the opensipsctl and opensipsdbctl setup 123 -# Here you can set variables used in the opensipsctl and opensipsdbctl setup
125 +## 128 +##
126 129
127 ## your SIP domain 130 ## your SIP domain
128 -# SIP_DOMAIN=opensips.org 131 -# SIP_DOMAIN=opensips.org
129 +# SIP_DOMAIN=name.host.tld 132 +# SIP_DOMAIN=name.host.tld
133 +
134 +## Database type: MYSQL, PGSQL, ORACLE, DB_BERKELEY, or DBTEXT;
135 +## by default none is loaded. Use opensipsdbctl to setup a database.
136 +DBENGINE=DBTEXT
130 137
131 -## database type: MYSQL, PGSQL, ORACLE, DB_BERKELEY, or DBTEXT, by default none is loaded 138 -## database type: MYSQL, PGSQL, ORACLE, DB_BERKELEY, or DBTEXT, by default none is loaded
132 -# If you want to setup a database with opensipsdbctl, you must at least specify 139 -# If you want to setup a database with opensipsdbctl, you must at least specify
133 -# this parameter. 140 -# this parameter.
134 -# DBENGINE=MYSQL 141 -# DBENGINE=MYSQL
135 +## Database type: MYSQL, PGSQL, ORACLE, DB_BERKELEY, or DBTEXT; 142 +## Path to MySQL client
136 +## by default none is loaded. Use opensipsdbctl to setup a database. 143 +MYSQL=@l_prefix@/bin/mysql
137 +DBENGINE=DBTEXT
138 144
139 ## database host 145 ## database host
140 # DBHOST=localhost 146 # DBHOST=localhost
141 147
142 -## database port (PostgreSQL=5433 mandatory; MYSQL=3306 optional) 148 -## database port (PostgreSQL=5433 mandatory; MYSQL=3306 optional)
186 -# SED=sed 192 -# SED=sed
187 +# SED="sed" 193 +# SED="sed"
188 194
189 195
190 # Describe what additional tables to install. Valid values for the variables 196 # Describe what additional tables to install. Valid values for the variables
191 @@ -54,14 +55,15 @@ 197 @@ -54,14 +58,15 @@
192 # 198 #
193 199
194 # Define what module tables should be installed. 200 # Define what module tables should be installed.
195 -# If you use the postgres database and want to change the installed tables, then you 201 -# If you use the postgres database and want to change the installed tables, then you
196 -# must also adjust the STANDARD_TABLES or EXTRA_TABLES variable accordingly in the 202 -# must also adjust the STANDARD_TABLES or EXTRA_TABLES variable accordingly in the
208 +# pdt dialog dispatcher dialplan drouting nathelper 214 +# pdt dialog dispatcher dialplan drouting nathelper
209 +# load_balancer" 215 +# load_balancer"
210 216
211 # opensips extra modules 217 # opensips extra modules
212 # EXTRA_MODULES="imc cpl siptrace domainpolicy carrierroute userblacklist" 218 # EXTRA_MODULES="imc cpl siptrace domainpolicy carrierroute userblacklist"
213 @@ -69,10 +71,10 @@ 219 @@ -69,10 +74,10 @@
214 220
215 ## type of aliases used: DB - database aliases; UL - usrloc aliases 221 ## type of aliases used: DB - database aliases; UL - usrloc aliases
216 ## - default: none 222 ## - default: none
217 -# ALIASES_TYPE=DB 223 -# ALIASES_TYPE=DB
218 +# ALIASES_TYPE="DB" 224 +# ALIASES_TYPE="DB"
221 -# MI_CONNECTOR=FIFO:/tmp/opensips_fifo 227 -# MI_CONNECTOR=FIFO:/tmp/opensips_fifo
222 +# MI_CONNECTOR=FIFO:@l_prefix@/var/opensips/opensips.fifo 228 +# MI_CONNECTOR=FIFO:@l_prefix@/var/opensips/opensips.fifo
223 # MI_CONNECTOR=UNIXSOCK:/tmp/opensips.sock 229 # MI_CONNECTOR=UNIXSOCK:/tmp/opensips.sock
224 # MI_CONNECTOR=UDP:192.168.2.133:8000 230 # MI_CONNECTOR=UDP:192.168.2.133:8000
225 # MI_CONNECTOR=XMLRPC:192.168.2.133:8000 231 # MI_CONNECTOR=XMLRPC:192.168.2.133:8000
226 @@ -80,22 +82,18 @@ 232 @@ -80,22 +85,18 @@
227 ## check ACL names; default on (1); off (0) 233 ## check ACL names; default on (1); off (0)
228 # VERIFY_ACL=1 234 # VERIFY_ACL=1
229 235
230 -## ACL names - if VERIFY_ACL is set, only the ACL names from below list 236 -## ACL names - if VERIFY_ACL is set, only the ACL names from below list
231 -## are accepted 237 -## are accepted

mercurial