opensips/opensips.patch.ctlrc

Tue, 28 Aug 2012 18:31:35 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Tue, 28 Aug 2012 18:31:35 +0200
changeset 547
1c75a8bb0fec
parent 409
7cc1c5d3b5e7
child 707
005bcc1c949b
permissions
-rw-r--r--

Update to new version, correct new flaky menuconfig implementation, modernize
packaging, and only conditionally implement strsep(3) on SVR4 missing it.

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

mercurial