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