update db scripts

(cherry picked from commit 33a2d4abe1)

kamailio/db_scripts/check-kazoodb-sql.sh

@@ -1,8 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 TEMP_DB_LOCATION=/tmp/db
 TEMP_DB=${TEMP_DB_LOCATION}/kazoo.db
 
+DB_CURRENT_DB=${DB_LOCATION:-/etc/kazoo/kamailio}/kazoo.db
+
 rm -rf ${TEMP_DB_LOCATION}
 . $(dirname $0)/kazoodb-sql.sh --source-only
 
@@ -11,11 +13,10 @@ sql_setup $file ${TEMP_DB_LOCATION}
 
 DB_VERSION=`KazooDB -db ${TEMP_DB} "select sum(table_version) from version;"`
 
-DB_CURRENT_DB=${DB_LOCATION:-/etc/kazoo/kamailio}/kazoo.db
 DB_CURRENT_VERSION=`KazooDB -db ${DB_CURRENT_DB} "select sum(table_version) from version;"`
 
 
-if [[ $DB_CURRENT_VERSION -ne $DB_VERSION ]]; then
+if [[ "$DB_CURRENT_VERSION" -ne "$DB_VERSION" ]]; then
    echo "db required version is ${DB_VERSION}, existing version is ${DB_CURRENT_VERSION}, applying diff"
    KazooDB-diff --schema  ${DB_CURRENT_DB} ${TEMP_DB} | KazooDB -db ${DB_CURRENT_DB}
    KazooDB-diff --primarykey --table version ${DB_CURRENT_DB} ${TEMP_DB} | KazooDB -db ${DB_CURRENT_DB}
@@ -44,3 +45,16 @@ fi
 for INIT in `ls ${DB_SCRIPT_DIR}/db_init_*.sql`; do
     KazooDB -db ${DB_CURRENT_DB} < $INIT
 done
+
+if [ -d ${DB_SCRIPT_DIR}/init.d ]; then
+for INIT in `ls ${DB_SCRIPT_DIR}/init.d/*.sql`; do
+    KazooDB -db ${DB_CURRENT_DB} < $INIT
+done
+fi
+
+if [ -d ${DB_SCRIPT_DIR}/sql.d ]; then
+for INIT in `ls ${DB_SCRIPT_DIR}/sql.d/*.sql`; do
+    KazooDB -db ${DB_CURRENT_DB} < $INIT
+done
+fi
+

kamailio/db_scripts/create-kazoodb-sql.sh

@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -e
 
 . $(dirname $0)/kazoodb-sql.sh --source-only
 

kamailio/db_scripts/db_kazoo-specific

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 sql_db_pre_setup() {
 cat << EOF
@@ -13,7 +13,8 @@ EOF
 }
 
 sql_setup() {
- DB_KAZOO_LOCATION=${2:-${DB_KAZOO_LOCATION:-/etc/kazoo/kamailio/db}}
+ DB_KAZOO_LOCATION=${2:-${DB_LOCATION:-/etc/kazoo/kamailio/db}}
+ echo "ensuring dir ${DB_KAZOO_LOCATION} exists"
  mkdir -p ${DB_KAZOO_LOCATION}
  KazooDB -db ${DB_KAZOO_LOCATION}/kazoo.db < $1 > /dev/null
 }

kamailio/db_scripts/kazoodb-sql.sh

@@ -2,7 +2,7 @@
 
 KAMAILIO_SHARE_DIR=${KAMAILIO_SHARE_DIR:-/usr/share/kamailio}
 DB_ENGINE=${DB_ENGINE:-db_kazoo}
-RESULTED_SQL=${RESULTED_SQL:-/tmp/kamailio_initdb.sql}
+RESULTED_SQL=${RESULTED_SQL:-/tmp/$(cat /proc/sys/kernel/random/uuid).sql}
 
 . $(dirname $0)/$DB_ENGINE-specific --source-only
 

kamailio/kamailio.cfg

@@ -41,9 +41,10 @@ loadmodule "textops.so"
 
 ####### Local Configuration ########
 include_file "local.cfg"
+import_files "local.d/*.cfg"
 
 ####### Custom defs ########
-import_file "custom-defs.cfg"
+import_files "defs.d/*.cfg"
 
 ####### defaults not configured in local ########
 include_file "defs.cfg"
@@ -55,7 +56,7 @@ include_file "globals.cfg"
 include_file "listener-defs.cfg"
 
 ####### custom listeners ########
-import_file "custom-listeners.cfg"
+import_files "listeners.d/*.cfg"
 
 ####### default listeners ########
 #!ifndef SKIP_DEFAULT_LISTENERS
@@ -66,6 +67,6 @@ include_file "default-listeners.cfg"
 include_file "default.cfg"
 
 ####### Extras Configuration ######
-import_files "./extras.d/*.cfg"
+import_files "extras.d/*.cfg"
 
 # vim: tabstop=4 softtabstop=4 shiftwidth=4 expandtab