Debian-Packaging: $NAME is now dependent of the script-name (easier for multi-instance setups e.g. IMS/VoLTE), more use of the $NAME for other directories.

pkg/kamailio/deb/debian/kamailio.init

@@ -16,12 +16,12 @@
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/sbin/kamailio
-NAME=kamailio
+NAME=`basename "$0"`
 DESC="Kamailio SIP Server"
-HOMEDIR=/var/run/kamailio
+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

pkg/kamailio/deb/jessie/kamailio.init

@@ -16,12 +16,12 @@
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/sbin/kamailio
-NAME=kamailio
+NAME=`basename "$0"`
 DESC="Kamailio SIP Server"
-HOMEDIR=/var/run/kamailio
+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

pkg/kamailio/deb/precise/kamailio.init

@@ -16,12 +16,12 @@
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/sbin/kamailio
-NAME=kamailio
+NAME=`basename "$0"`
 DESC="Kamailio SIP Server"
-HOMEDIR=/var/run/kamailio
+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

pkg/kamailio/deb/squeeze/kamailio.init

@@ -16,12 +16,12 @@
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/sbin/kamailio
-NAME=kamailio
+NAME=`basename "$0"`
 DESC="Kamailio SIP Server"
-HOMEDIR=/var/run/kamailio
+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

pkg/kamailio/deb/trusty/kamailio.init

@@ -16,12 +16,12 @@
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/sbin/kamailio
-NAME=kamailio
+NAME=`basename "$0"`
 DESC="Kamailio SIP Server"
-HOMEDIR=/var/run/kamailio
+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
 

pkg/kamailio/deb/wheezy/kamailio.init

@@ -16,12 +16,12 @@
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/sbin/kamailio
-NAME=kamailio
+NAME=`basename "$0"`
 DESC="Kamailio SIP Server"
-HOMEDIR=/var/run/kamailio
+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