opensips/opensips.patch.ctlrc@a2c6460cfb16
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.
1 Index: scripts/opensipsctlrc
2 diff -Nau scripts/opensipsctlrc.orig scripts/opensipsctlrc
3 --- scripts/opensipsctlrc.orig 2011-08-24 10:12:07.000000000 +0200
4 +++ scripts/opensipsctlrc 2012-03-22 19:04:38.092856433 +0100
5 @@ -1,13 +1,9 @@
6 -# $Id: opensipsctlrc 9049 2012-05-24 14:03:31Z osas $
7 -#
8 -# The OpenSIPS configuration file for the control tools.
9 -#
10 -# Here you can set variables used in the opensipsctl and opensipsdbctl setup
11 -# scripts. Per default all variables here are commented out, the control tools
12 -# will use their internal default values.
13 +##
14 +## opensipsctlrc -- OpenSIPS control tools configuration
15 +##
17 ## your SIP domain
18 -# SIP_DOMAIN=opensips.org
19 +# SIP_DOMAIN=name.host.tld
21 ## chrooted directory
22 # $CHROOT_DIR="/path/to/chrooted/directory"
23 @@ -18,6 +14,9 @@
24 # this parameter.
25 # DBENGINE=MYSQL
27 +## Path to MySQL client
28 +MYSQL=@l_prefix@/bin/mysql
29 +
30 ## database host
31 # DBHOST=localhost
33 @@ -25,16 +24,22 @@
34 # DBNAME=opensips
36 # database path used by dbtext or db_berkeley
37 -# DB_PATH="/usr/local/etc/opensips/dbtext"
38 +DB_PATH=@l_prefix@/var/opensips/db
40 ## database read/write user
41 -# DBRWUSER=opensips
42 +# DBRWUSER=@l_rusr@
44 ## password for database read/write user
45 -# DBRWPW="opensipsrw"
46 +# DBRWPW=rente_word_pass_rw
47 +
48 +## database read only user
49 +# DBROUSER=@l_rusr@
50 +
51 +## password for database read only user
52 +# DBROPW=rentero_word_pass
54 ## database super user (for ORACLE this is 'scheme-creator' user)
55 -# DBROOTUSER="root"
56 +# DBROOTUSER=@l_susr@
58 # user name column
59 # USERCOL="username"
60 @@ -43,7 +48,7 @@
61 # SQL definitions
62 # If you change this definitions here, then you must change them
63 # in db/schema/entities.xml too.
64 -# FIXME
65 +#
67 # FOREVER="2020-05-28 21:32:15"
68 # DEFAULT_ALIASES_EXPIRES=$FOREVER
69 @@ -97,13 +102,16 @@
71 ## control engine: FIFO or UNIXSOCK
72 ## - default FIFO
73 -# CTLENGINE=xmlrpc
74 +CTLENGINE=FIFO
76 ## path to FIFO file
77 -# OSIPS_FIFO="/tmp/opensips_fifo"
78 +OSIPS_FIFO=@l_prefix@/var/opensips/opensips.fifo
79 +
80 +## path to server inbound FIFO directory
81 +OSER_FIRET=@l_prefix@/var/opensips
83 ## MI_CONNECTOR control engine: FIFO, UNIXSOCK, UDP, XMLRPC
84 -# MI_CONNECTOR=FIFO:/tmp/opensips_fifo
85 +# MI_CONNECTOR=FIFO:@l_prefix@/var/opensips/opensips.fifo
86 # MI_CONNECTOR=UNIXSOCK:/tmp/opensips.sock
87 # MI_CONNECTOR=UDP:192.168.2.133:8000
88 # MI_CONNECTOR=XMLRPC:192.168.2.133:8000
89 @@ -120,15 +128,16 @@
91 ## do (1) or don't (0) store plaintext passwords
92 ## in the subscriber table - default '1'
93 -# STORE_PLAINTEXT_PW=0
94 +STORE_PLAINTEXT_PW=0
96 ## do not display the output highlighted
97 # NOHLPRINT=1
99 ## OPENSIPS START Options
100 -## PID file path - default is: /var/run/opensips.pid
101 -# PID_FILE=/var/run/opensips.pid
102 +## PID file path - default is: @l_prefix@/var/opensips/opensips.pid
103 +PID_FILE=@l_prefix@/var/opensips/opensips.pid
105 ## Extra start options - default is: not set
106 # example: start opensips with 64MB share memory: STARTOPTIONS="-m 64"
107 +# ...as opposed to the 32MB share memory default value in 1.7
108 # STARTOPTIONS=
109 Index: scripts/osipsconsolerc
110 diff -Nau scripts/osipsconsolerc.orig scripts/osipsconsolerc
111 --- scripts/osipsconsolerc.orig 2011-07-12 18:42:53.000000000 +0200
112 +++ scripts/osipsconsolerc 2012-03-22 19:04:45.670384106 +0100
113 @@ -1,51 +1,56 @@
114 -# $Id: osicpsconsolerc
115 -#
116 -# The OpenSIPS configuration file for the control tools.
117 -#
118 -# Here you can set variables used in the opensipsctl and opensipsdbctl setup
119 -# scripts. Per default all variables here are commented out, the control tools
120 -# will use their internal default values.
121 +##
122 +## osipsconsolerc -- OpenSIPS management configuration
123 +##
125 ## your SIP domain
126 -# SIP_DOMAIN=opensips.org
127 +# SIP_DOMAIN=name.host.tld
129 ## database type: MYSQL, PGSQL, ORACLE, DB_BERKELEY, or DBTEXT, by default none is loaded
130 # If you want to setup a database with opensipsdbctl, you must at least specify
131 # this parameter.
132 # DBENGINE=MYSQL
134 +## Path to MySQL client
135 +MYSQL=@l_prefix@/bin/mysql
136 +
137 ## database host
138 # DBHOST=localhost
140 -## database port (PostgreSQL=5433 mandatory; MYSQL=3306 optional)
141 -# DBPORT=3306
142 +## database port for PostgreSQL
143 +# DBPORT=5433
145 ## database name (for ORACLE this is TNS name)
146 # DBNAME=opensips
148 ## database path used by dbtext or db_berkeley
149 -# DB_PATH="/usr/local/etc/opensips/dbtext"
150 +DB_PATH=@l_prefix@/var/opensips/db
152 ## database read/write user
153 -# DBRWUSER=opensips
154 +# DBRWUSER=@l_rusr@
156 ## password for database read/write user
157 -# DBRWPW=opensipsrw
158 +# DBRWPW=rente_word_pass_rw
159 +
160 +## database read only user
161 +# DBROUSER=@l_rusr@
162 +
163 +## password for database read only user
164 +# DBROPW=rentero_word_pass
166 ## database super user (for ORACLE this is 'scheme-creator' user)
167 -# DBROOTUSER=root
168 +# DBROOTUSER=@l_susr@
170 -# Program to calculate a message-digest fingerprint
171 -# MD5=md5sum
172 +# Program to calculate a message-digest fingerprint
173 +# MD5="md5sum"
175 # awk tool
176 -# AWK=awk
177 +# AWK="awk"
179 # grep tool
180 -# GREP=egrep
181 +# GREP="egrep"
183 # sed tool
184 -# SED=sed
185 +# SED="sed"
188 # Describe what additional tables to install. Valid values for the variables
189 @@ -54,14 +59,15 @@
190 #
192 # Define what module tables should be installed.
193 -# If you use the postgres database and want to change the installed tables, then you
194 -# must also adjust the STANDARD_TABLES or EXTRA_TABLES variable accordingly in the
195 -# opensipsdbctl.base script.
196 +# If you use the postgres database and want to change the installed tables,
197 +# then you must also adjust the STANDARD_TABLES or EXTRA_TABLES variable
198 +# accordingly in the opensipsdbctl.base script.
200 # opensips standard modules
201 -# STANDARD_MODULES="standard acc domain group permissions registrar usrloc msilo
202 -# alias_db uri_db speeddial avpops auth_db pdt dialog dispatcher
203 -# dialplan drouting nathelper load_balancer"
204 +# STANDARD_MODULES="standard acc domain group permissions registrar
205 +# usrloc msilo alias_db uri_db speeddial avpops auth_db
206 +# pdt dialog dispatcher dialplan drouting nathelper
207 +# load_balancer"
209 # opensips extra modules
210 # EXTRA_MODULES="imc cpl siptrace domainpolicy carrierroute userblacklist"
211 @@ -69,10 +75,10 @@
213 ## type of aliases used: DB - database aliases; UL - usrloc aliases
214 ## - default: none
215 -# ALIASES_TYPE=DB
216 +# ALIASES_TYPE="DB"
218 ## MI_CONNECTOR control engine: FIFO, UNIXSOCK, UDP, XMLRPC
219 -# MI_CONNECTOR=FIFO:/tmp/opensips_fifo
220 +# MI_CONNECTOR=FIFO:@l_prefix@/var/opensips/opensips.fifo
221 # MI_CONNECTOR=UNIXSOCK:/tmp/opensips.sock
222 # MI_CONNECTOR=UDP:192.168.2.133:8000
223 # MI_CONNECTOR=XMLRPC:192.168.2.133:8000
224 @@ -80,22 +86,18 @@
225 ## check ACL names; default on (1); off (0)
226 # VERIFY_ACL=1
228 -## ACL names - if VERIFY_ACL is set, only the ACL names from below list
229 -## are accepted
230 +## ACL names - if VERIFY_ACL is set, only ACL names from list are accepted
231 # ACL_GROUPS="local ld int voicemail free-pstn"
233 ## do (1) or don't (0) store plaintext passwords
234 ## in the subscriber table - default '1'
235 -# STORE_PLAINTEXT_PW=1
236 +STORE_PLAINTEXT_PW=0
238 ## OPENSIPS START Options
239 -## PID file path - default is: /var/run/opensips.pid
240 -# PID_FILE=/var/run/opensips.pid
241 -
242 -## OUTPUT control - default output is to SYSLOG
243 -## 0=output to console, 1=output to syslog
244 -# SYSLOG=0
245 +## PID file path - default is: @l_prefix@/var/opensips/opensips.pid
246 +PID_FILE=@l_prefix@/var/opensips/opensips.pid
248 ## Extra start options - default is: not set
249 # example: start opensips with 64MB share memory: STARTOPTIONS="-m 64"
250 +# ...as opposed to the 32MB share memory default value in 1.7
251 # STARTOPTIONS=
