[sr-dev] git:4.2: pkg/rpm: updated values for memory size in specs

Module: sip-router Branch: 4.2 Commit: 3948305d86f6211428f60c58e138b18aacb3dde5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3948305… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 16 09:55:58 2014 +0200 pkg/rpm: updated values for memory size in specs (cherry picked from commit 22aef82dbc60f67dd606e568308114118de729a0) --- pkg/kamailio/rpm/kamailio.default | 2 +- pkg/kamailio/rpm/kamailio.init | 4 ++-- pkg/kamailio/rpm/kamailio.init.SuSE | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkg/kamailio/rpm/kamailio.default b/pkg/kamailio/rpm/kamailio.default index 90e6ca7..9070289 100644 --- a/pkg/kamailio/rpm/kamailio.default +++ b/pkg/kamailio/rpm/kamailio.default @@ -15,7 +15,7 @@ GROUP=kamailio SHM_MEMORY=64 # Amount of private memory to allocate for the running Kamailio server (in Mb) -PKG_MEMORY=4 +PKG_MEMORY=8 # Enable the server to leave a core file when it crashes. # Set this to 'yes' to enable kamailio to leave a core file when it crashes diff --git a/pkg/kamailio/rpm/kamailio.init b/pkg/kamailio/rpm/kamailio.init index cf76929..4f81925 100644 --- a/pkg/kamailio/rpm/kamailio.init +++ b/pkg/kamailio/rpm/kamailio.init @@ -81,8 +81,8 @@ SHM_MEMORY=$((`echo $SHM_MEMORY | sed -e 's/[^0-9]//g'`)) PKG_MEMORY=$((`echo $PKG_MEMORY | sed -e 's/[^0-9]//g'`)) [ -z "$USER" ] && USER=kamailio [ -z "$GROUP" ] && GROUP=kamailio -[ $SHM_MEMORY -le 0 ] && SHM_MEMORY=32 -[ $PKG_MEMORY -le 0 ] && PKG_MEMORY=4 +[ $SHM_MEMORY -le 0 ] && SHM_MEMORY=64 +[ $PKG_MEMORY -le 0 ] && PKG_MEMORY=8 if test "$DUMP_CORE" = "yes" ; then # set proper ulimit diff --git a/pkg/kamailio/rpm/kamailio.init.SuSE b/pkg/kamailio/rpm/kamailio.init.SuSE index ac0f655..d871364 100644 --- a/pkg/kamailio/rpm/kamailio.init.SuSE +++ b/pkg/kamailio/rpm/kamailio.init.SuSE @@ -18,12 +18,12 @@ # Check for missing binaries (stale symlinks should not happen) -OSER_BIN=/usr/sbin/kamailio -test -x $OSER_BIN || exit 5 +KAM_BIN=/usr/sbin/kamailio +test -x $KAM_BIN || exit 5 # Check for existence of needed config file and read it -OSER_CONFIG=/etc/kamailio/kamailio.cfg -test -r $OSER_CONFIG || exit 6 +KAM_CONFIG=/etc/kamailio/kamailio.cfg +test -r $KAM_CONFIG || exit 6 # Shell functions sourced from /etc/rc.status: # rc_check check and set local and overall rc status @@ -64,7 +64,7 @@ case "$1" in echo -n "Starting Kamailio " ## Start daemon with startproc(8). If this fails ## the return value is set appropriately by startproc. - startproc $OSER_BIN -f $OSER_CONFIG + startproc $KAM_BIN -f $KAM_CONFIG # Remember status and be verbose rc_status -v @@ -74,7 +74,7 @@ case "$1" in ## Stop daemon with killproc(8) and if this fails ## killproc sets the return value according to LSB. - killproc -TERM $OSER_BIN + killproc -TERM $KAM_BIN # Remember status and be verbose rc_status -v @@ -120,7 +120,7 @@ case "$1" in # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) # NOTE: checkproc returns LSB compliant status values. - checkproc $OSER_BIN + checkproc $KAM_BIN # NOTE: rc_status knows that we called this init script with # "status" option and adapts its messages accordingly. rc_status -v