[Astlinux-commits] SF.net SVN: astlinux:[6674] branches/1.0/package/kamailio

[<abe...@us...>]

Revision: 6674
          http://sourceforge.net/p/astlinux/code/6674
Author:   abelbeck
Date:     2014-08-27 22:39:01 +0000 (Wed, 27 Aug 2014)
Log Message:
-----------
kamailio, move database file to: /mnt/kd/kamailio/data/kamailio.sqlite

Modified Paths:
--------------
    branches/1.0/package/kamailio/etc/kamailio-basic.cfg
    branches/1.0/package/kamailio/etc/kamailio.cfg
    branches/1.0/package/kamailio/kamailio.init
    branches/1.0/package/kamailio/kamailio.mk

Modified: branches/1.0/package/kamailio/etc/kamailio-basic.cfg
===================================================================
--- branches/1.0/package/kamailio/etc/kamailio-basic.cfg	2014-08-27 14:34:56 UTC (rev 6673)
+++ branches/1.0/package/kamailio/etc/kamailio-basic.cfg	2014-08-27 22:39:01 UTC (rev 6674)
@@ -71,7 +71,7 @@
 # - database URL - used to connect to database server by modules such
 #       as: auth_db, acc, usrloc, a.s.o.
 #!ifndef DBURL
-#!define DBURL "sqlite:///mnt/kd/kamailio.sqlite3"
+#!define DBURL "sqlite:///mnt/kd/kamailio/data/kamailio.sqlite3"
 #!endif
 #!endif
 #!define MULTIDOMAIN 0

Modified: branches/1.0/package/kamailio/etc/kamailio.cfg
===================================================================
--- branches/1.0/package/kamailio/etc/kamailio.cfg	2014-08-27 14:34:56 UTC (rev 6673)
+++ branches/1.0/package/kamailio/etc/kamailio.cfg	2014-08-27 22:39:01 UTC (rev 6674)
@@ -109,7 +109,7 @@
 # - database URL - used to connect to database server by modules such
 #       as: auth_db, acc, usrloc, a.s.o.
 #!ifndef DBURL
-#!define DBURL "sqlite:///mnt/kd/kamailio.sqlite3"
+#!define DBURL "sqlite:///mnt/kd/kamailio/data/kamailio.sqlite3"
 #!endif
 #!endif
 #!ifdef WITH_MULTIDOMAIN

Modified: branches/1.0/package/kamailio/kamailio.init
===================================================================
--- branches/1.0/package/kamailio/kamailio.init	2014-08-27 14:34:56 UTC (rev 6673)
+++ branches/1.0/package/kamailio/kamailio.init	2014-08-27 22:39:01 UTC (rev 6674)
@@ -9,8 +9,11 @@
   if [ -f /etc/kamailio/kamctlrc ]; then
     . /etc/kamailio/kamctlrc
   fi
-  db_path="${DB_PATH:-/mnt/kd/kamailio.sqlite3}"
+  db_path="${DB_PATH:-/mnt/kd/kamailio/data/kamailio.sqlite3}"
 
+  if [ -d /mnt/kd/kamailio/data ]; then
+    chown kamailio:kamailio /mnt/kd/kamailio/data
+  fi
   if [ -f "$db_path" ]; then
     chown kamailio:kamailio "$db_path"
   fi
@@ -28,6 +31,10 @@
     exit
   fi
 
+  if [ ! -d /mnt/kd/kamailio/data ]; then
+    mkdir /mnt/kd/kamailio/data
+    chown kamailio:kamailio /mnt/kd/kamailio/data
+  fi
   if [ ! -d /mnt/kd/kamailio/certs ]; then
     mkdir /mnt/kd/kamailio/certs
     chown kamailio:kamailio /mnt/kd/kamailio/certs

Modified: branches/1.0/package/kamailio/kamailio.mk
===================================================================
--- branches/1.0/package/kamailio/kamailio.mk	2014-08-27 14:34:56 UTC (rev 6673)
+++ branches/1.0/package/kamailio/kamailio.mk	2014-08-27 22:39:01 UTC (rev 6674)
@@ -74,7 +74,7 @@
 	rm -rf $(TARGET_DIR)/etc/kamailio
 	rsync -a --exclude=".svn" package/kamailio/etc/ $(TARGET_DIR)/stat/etc/kamailio/
 	$(SED) 's:^[# ]*DBENGINE=.*$$:DBENGINE=SQLITE:' \
-	    -e 's:^[# ]*DB_PATH=.*$$:DB_PATH="/mnt/kd/kamailio.sqlite3":' \
+	    -e 's:^[# ]*DB_PATH=.*$$:DB_PATH="/mnt/kd/kamailio/data/kamailio.sqlite3":' \
 	    -e 's:^[# ]*PID_FILE=.*$$:PID_FILE="/var/run/kamailio/kamailio.pid":' \
 	    -e 's:^[# ]*STARTOPTIONS=.*$$:STARTOPTIONS="-u kamailio -g kamailio":' \
 		$(TARGET_DIR)/stat/etc/kamailio/kamctlrc

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.