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