[Pkg-voip-commits] [kamailio] 01/01: kamailio.init: use NAME and chown HOMEDIR just after create it

[Victor Seva Lopez]

This is an automated email from the git hooks/post-receive script.

maniac-guest pushed a commit to branch master
in repository kamailio.

commit 74a625527d83276f7d8ee1436f8e1411129f8ca5
Author: Victor Seva <linuxmaniac at torreviejawireless.org>
Date:   Tue Jul 14 17:33:59 2015 +0200

    kamailio.init: use NAME and chown HOMEDIR just after create it
---
 debian/kamailio.init | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/debian/kamailio.init b/debian/kamailio.init
index 7a31400..b14f83a 100644
--- a/debian/kamailio.init
+++ b/debian/kamailio.init
@@ -16,12 +16,12 @@
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/sbin/kamailio
-NAME=kamailio
-DESC="Kamailio SIP server"
-HOMEDIR=/var/run/kamailio
+NAME=`basename "$0"`
+DESC="Kamailio SIP Server"
+HOMEDIR=/var/run/$NAME
 PIDFILE=$HOMEDIR/$NAME.pid
-DEFAULTS=/etc/default/kamailio
-CFGFILE=/etc/kamailio/kamailio.cfg
+DEFAULTS=/etc/default/$NAME
+CFGFILE=/etc/$NAME/kamailio.cfg
 RUN_KAMAILIO=no
 USER=kamailio
 GROUP=kamailio
@@ -67,9 +67,9 @@ create_radius_seqfile ()
     # write to the file. If the file exists before kamailio starts, it
     # won't change it's ownership and will be writable for both root
     # and kamailio, no matter what options are chosen at install time
-    RADIUS_SEQ_FILE=/var/run/kamailio/kamailio_radius.seq
-    if [ -d /var/run/kamailio ]; then
-	chown ${USER}:${GROUP} /var/run/kamailio
+    RADIUS_SEQ_FILE="$HOMEDIR/kamailio_radius.seq"
+    if [ -d $HOMEDIR ]; then
+	chown ${USER}:${GROUP} $HOMEDIR
 
 	if [ ! -f $RADIUS_SEQ_FILE ]; then
 	    touch $RADIUS_SEQ_FILE
@@ -88,7 +88,7 @@ if [ -f $DEFAULTS ]; then
 fi
 
 if [ "$RUN_KAMAILIO" != "yes" ]; then
-    log_failure_msg "Kamailio not yet configured. Edit /etc/default/kamailio first."
+    log_failure_msg "Kamailio not yet configured. Edit /etc/default/$NAME first."
     exit 0
 fi
 
@@ -115,6 +115,7 @@ fi
 # /var/run can be a tmpfs
 if [ ! -d $HOMEDIR ]; then
     mkdir -p $HOMEDIR
+    chown ${USER}:${GROUP} $HOMEDIR
 fi
 
 OPTIONS="-f $CFGFILE -P $PIDFILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/kamailio.git