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