michael@409: Index: scripts/opensipsctlrc
michael@409: diff -Nau scripts/opensipsctlrc.orig scripts/opensipsctlrc
michael@409: --- scripts/opensipsctlrc.orig	2011-08-24 10:12:07.000000000 +0200
michael@409: +++ scripts/opensipsctlrc	2012-03-22 19:04:38.092856433 +0100
michael@409: @@ -1,22 +1,16 @@
michael@409: -# $Id: opensipsctlrc 8290 2011-08-23 14:14:10Z razvancrainea $
michael@409: -#
michael@409: -# The OpenSIPS configuration file for the control tools.
michael@409: -#
michael@409: -# Here you can set variables used in the opensipsctl and opensipsdbctl setup
michael@409: -# scripts. Per default all variables here are commented out, the control tools
michael@409: -# will use their internal default values.
michael@409: +##
michael@409: +##  opensipsctlrc -- OpenSIPS control tools configuration
michael@409: +##
michael@409:  
michael@409:  ## your SIP domain
michael@409: -# SIP_DOMAIN=opensips.org
michael@409: +# SIP_DOMAIN=name.host.tld
michael@409:  
michael@409:  ## chrooted directory
michael@409:  # $CHROOT_DIR="/path/to/chrooted/directory"
michael@409:  
michael@409: -## database type: MYSQL, PGSQL, ORACLE, DB_BERKELEY, or DBTEXT, 
michael@409: -## by default none is loaded
michael@409: -# If you want to setup a database with opensipsdbctl, you must at least specify
michael@409: -# this parameter.
michael@409: -# DBENGINE=MYSQL
michael@409: +## Database type: MYSQL, PGSQL, ORACLE, DB_BERKELEY, or DBTEXT;
michael@409: +## by default none is loaded. Use opensipsdbctl to setup a database.
michael@409: +DBENGINE=DBTEXT
michael@409:  
michael@409:  ## database host
michael@409:  # DBHOST=localhost
michael@409: @@ -25,16 +19,22 @@
michael@409:  # DBNAME=opensips
michael@409:  
michael@409:  # database path used by dbtext or db_berkeley
michael@409: -# DB_PATH="/usr/local/etc/opensips/dbtext"
michael@409: +DB_PATH=@l_prefix@/var/opensips/db
michael@409:  
michael@409:  ## database read/write user
michael@409: -# DBRWUSER=opensips
michael@409: +# DBRWUSER=@l_rusr@
michael@409:  
michael@409:  ## password for database read/write user
michael@409: -# DBRWPW="opensipsrw"
michael@409: +# DBRWPW=rente_word_pass_rw
michael@409: +
michael@409: +## database read only user
michael@409: +# DBROUSER=@l_rusr@
michael@409: +
michael@409: +## password for database read only user
michael@409: +# DBROPW=rentero_word_pass
michael@409:  
michael@409:  ## database super user (for ORACLE this is 'scheme-creator' user)
michael@409: -# DBROOTUSER="root"
michael@409: +# DBROOTUSER=@l_susr@
michael@409:  
michael@409:  # user name column
michael@409:  # USERCOL="username"
michael@409: @@ -43,7 +43,7 @@
michael@409:  # SQL definitions
michael@409:  # If you change this definitions here, then you must change them 
michael@409:  # in db/schema/entities.xml too.
michael@409: -# FIXME
michael@409: +#
michael@409:  
michael@409:  # FOREVER="2020-05-28 21:32:15"
michael@409:  # DEFAULT_ALIASES_EXPIRES=$FOREVER
michael@409: @@ -97,13 +97,16 @@
michael@409:  
michael@409:  ## control engine: FIFO or UNIXSOCK
michael@409:  ## - default FIFO
michael@409: -# CTLENGINE=xmlrpc
michael@409: +CTLENGINE=FIFO
michael@409:  
michael@409:  ## path to FIFO file
michael@409: -# OSIPS_FIFO="/tmp/opensips_fifo"
michael@409: +OSIPS_FIFO=@l_prefix@/var/opensips/opensips.fifo
michael@409: +
michael@409: +## path to server inbound FIFO directory
michael@409: +OSER_FIRET=@l_prefix@/var/opensips
michael@409:  
michael@409:  ## MI_CONNECTOR control engine: FIFO, UNIXSOCK, UDP, XMLRPC
michael@409: -# MI_CONNECTOR=FIFO:/tmp/opensips_fifo
michael@409: +# MI_CONNECTOR=FIFO:@l_prefix@/var/opensips/opensips.fifo
michael@409:  # MI_CONNECTOR=UNIXSOCK:/tmp/opensips.sock
michael@409:  # MI_CONNECTOR=UDP:192.168.2.133:8000
michael@409:  # MI_CONNECTOR=XMLRPC:192.168.2.133:8000
michael@409: @@ -120,15 +123,16 @@
michael@409:  
michael@409:  ## do (1) or don't (0) store plaintext passwords
michael@409:  ## in the subscriber table - default '1'
michael@409: -# STORE_PLAINTEXT_PW=0
michael@409: +STORE_PLAINTEXT_PW=0
michael@409:  
michael@409:  ## do not display the output highlighted
michael@409:  # NOHLPRINT=1
michael@409:  
michael@409:  ## OPENSIPS START Options
michael@409: -## PID file path - default is: /var/run/opensips.pid
michael@409: -# PID_FILE=/var/run/opensips.pid
michael@409: +## PID file path - default is: @l_prefix@/var/opensips/opensips.pid
michael@409: +PID_FILE=@l_prefix@/var/opensips/opensips.pid
michael@409:  
michael@409:  ## Extra start options - default is: not set
michael@409:  # example: start opensips with 64MB share memory: STARTOPTIONS="-m 64"
michael@409: +#          ...as opposed to the 32MB share memory default value in 1.7
michael@409:  # STARTOPTIONS=
michael@409: Index: scripts/osipsconsolerc
michael@409: diff -Nau scripts/osipsconsolerc.orig scripts/osipsconsolerc
michael@409: --- scripts/osipsconsolerc.orig	2011-07-12 18:42:53.000000000 +0200
michael@409: +++ scripts/osipsconsolerc	2012-03-22 19:04:45.670384106 +0100
michael@409: @@ -1,51 +1,52 @@
michael@409: -# $Id: osicpsconsolerc 
michael@409: -#
michael@409: -# The OpenSIPS configuration file for the control tools.
michael@409: -#
michael@409: -# Here you can set variables used in the opensipsctl and opensipsdbctl setup
michael@409: -# scripts. Per default all variables here are commented out, the control tools
michael@409: -# will use their internal default values.
michael@409: +##
michael@409: +##  osipsconsolerc -- OpenSIPS management configuration
michael@409: +##
michael@409:  
michael@409:  ## your SIP domain
michael@409: -# SIP_DOMAIN=opensips.org
michael@409: +# SIP_DOMAIN=name.host.tld
michael@409:  
michael@409: -## database type: MYSQL, PGSQL, ORACLE, DB_BERKELEY, or DBTEXT, by default none is loaded
michael@409: -# If you want to setup a database with opensipsdbctl, you must at least specify
michael@409: -# this parameter.
michael@409: -# DBENGINE=MYSQL
michael@409: +## Database type: MYSQL, PGSQL, ORACLE, DB_BERKELEY, or DBTEXT;
michael@409: +## by default none is loaded. Use opensipsdbctl to setup a database.
michael@409: +DBENGINE=DBTEXT
michael@409:  
michael@409:  ## database host
michael@409:  # DBHOST=localhost
michael@409:  
michael@409: -## database port (PostgreSQL=5433 mandatory; MYSQL=3306 optional)
michael@409: -# DBPORT=3306
michael@409: +## database port for PostgreSQL
michael@409: +# DBPORT=5433
michael@409:  
michael@409:  ## database name (for ORACLE this is TNS name)
michael@409:  # DBNAME=opensips
michael@409:  
michael@409:  ## database path used by dbtext or db_berkeley
michael@409: -# DB_PATH="/usr/local/etc/opensips/dbtext"
michael@409: +DB_PATH=@l_prefix@/var/opensips/db
michael@409:  
michael@409:  ## database read/write user
michael@409: -# DBRWUSER=opensips
michael@409: +# DBRWUSER=@l_rusr@
michael@409:  
michael@409:  ## password for database read/write user
michael@409: -# DBRWPW=opensipsrw
michael@409: +# DBRWPW=rente_word_pass_rw
michael@409: +
michael@409: +## database read only user
michael@409: +# DBROUSER=@l_rusr@
michael@409: +
michael@409: +## password for database read only user
michael@409: +# DBROPW=rentero_word_pass
michael@409:  
michael@409:  ## database super user (for ORACLE this is 'scheme-creator' user)
michael@409: -# DBROOTUSER=root
michael@409: +# DBROOTUSER=@l_susr@
michael@409:  
michael@409: -# Program to calculate a message-digest fingerprint 
michael@409: -# MD5=md5sum
michael@409: +# Program to calculate a message-digest fingerprint
michael@409: +# MD5="md5sum"
michael@409:  
michael@409:  # awk tool
michael@409: -# AWK=awk
michael@409: +# AWK="awk"
michael@409:  
michael@409:  # grep tool
michael@409: -# GREP=egrep
michael@409: +# GREP="egrep"
michael@409:  
michael@409:  # sed tool
michael@409: -# SED=sed
michael@409: +# SED="sed"
michael@409:  
michael@409:  
michael@409:  # Describe what additional tables to install. Valid values for the variables
michael@409: @@ -54,14 +55,15 @@
michael@409:  #
michael@409:  
michael@409:  # Define what module tables should be installed.
michael@409: -# If you use the postgres database and want to change the installed tables, then you
michael@409: -# must also adjust the STANDARD_TABLES or EXTRA_TABLES variable accordingly in the
michael@409: -# opensipsdbctl.base script.
michael@409: +# If you use the postgres database and want to change the installed tables,
michael@409: +# then you must also adjust the STANDARD_TABLES or EXTRA_TABLES variable
michael@409: +# accordingly in the opensipsdbctl.base script.
michael@409:  
michael@409:  # opensips standard modules
michael@409: -# STANDARD_MODULES="standard acc domain group permissions registrar usrloc msilo
michael@409: -#                   alias_db uri_db speeddial avpops auth_db pdt dialog dispatcher
michael@409: -#                   dialplan drouting nathelper load_balancer"
michael@409: +# STANDARD_MODULES="standard acc domain group permissions registrar
michael@409: +#                   usrloc msilo alias_db uri_db speeddial avpops auth_db
michael@409: +#                   pdt dialog dispatcher dialplan drouting nathelper
michael@409: +#                   load_balancer"
michael@409:  
michael@409:  # opensips extra modules
michael@409:  # EXTRA_MODULES="imc cpl siptrace domainpolicy carrierroute userblacklist"
michael@409: @@ -69,10 +71,10 @@
michael@409:  
michael@409:  ## type of aliases used: DB - database aliases; UL - usrloc aliases
michael@409:  ## - default: none
michael@409: -# ALIASES_TYPE=DB
michael@409: +# ALIASES_TYPE="DB"
michael@409:  
michael@409:  ## MI_CONNECTOR control engine: FIFO, UNIXSOCK, UDP, XMLRPC
michael@409: -# MI_CONNECTOR=FIFO:/tmp/opensips_fifo
michael@409: +# MI_CONNECTOR=FIFO:@l_prefix@/var/opensips/opensips.fifo
michael@409:  # MI_CONNECTOR=UNIXSOCK:/tmp/opensips.sock
michael@409:  # MI_CONNECTOR=UDP:192.168.2.133:8000
michael@409:  # MI_CONNECTOR=XMLRPC:192.168.2.133:8000
michael@409: @@ -80,22 +82,18 @@
michael@409:  ## check ACL names; default on (1); off (0)
michael@409:  # VERIFY_ACL=1
michael@409:  
michael@409: -## ACL names - if VERIFY_ACL is set, only the ACL names from below list
michael@409: -## are accepted
michael@409: +## ACL names - if VERIFY_ACL is set, only ACL names from list are accepted
michael@409:  # ACL_GROUPS="local ld int voicemail free-pstn"
michael@409:  
michael@409:  ## do (1) or don't (0) store plaintext passwords
michael@409:  ## in the subscriber table - default '1'
michael@409: -# STORE_PLAINTEXT_PW=1
michael@409: +STORE_PLAINTEXT_PW=0
michael@409:  
michael@409:  ## OPENSIPS START Options
michael@409: -## PID file path - default is: /var/run/opensips.pid
michael@409: -# PID_FILE=/var/run/opensips.pid
michael@409: -
michael@409: -## OUTPUT control - default output is to SYSLOG
michael@409: -## 0=output to console, 1=output to syslog
michael@409: -# SYSLOG=0
michael@409: +## PID file path - default is: @l_prefix@/var/opensips/opensips.pid
michael@409: +PID_FILE=@l_prefix@/var/opensips/opensips.pid
michael@409:  
michael@409:  ## Extra start options - default is: not set
michael@409:  # example: start opensips with 64MB share memory: STARTOPTIONS="-m 64"
michael@409: +#          ...as opposed to the 32MB share memory default value in 1.7
michael@409:  # STARTOPTIONS=