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