From 30bc66ca7169c98d26955d97c53bf5ff2849320b Mon Sep 17 00:00:00 2001
From: Keith Whyte <keith@rhizomatica.org>
Date: Wed, 2 Sep 2020 13:34:21 +0200
Subject: [PATCH] Add sms_db param and sms() shell function

---
 modules/rhizo_base/manifests/init.pp               | 3 ++-
 modules/rhizo_base/manifests/osmocom.pp            | 1 +
 modules/rhizo_base/templates/config_values.py.erb  | 2 +-
 modules/rhizo_base/templates/osmo-msc.cfg.erb      | 1 +
 modules/rhizo_base/templates/rccn-functions.sh.erb | 7 ++++++-
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/modules/rhizo_base/manifests/init.pp b/modules/rhizo_base/manifests/init.pp
index 849e987..91d7b44 100644
--- a/modules/rhizo_base/manifests/init.pp
+++ b/modules/rhizo_base/manifests/init.pp
@@ -20,7 +20,8 @@ class rhizo_base {
   $notouchcron     = hiera('rhizo::notouchcron', 0)
   $use_ups         = hiera('rhizo::use_ups')
   $rhizomatica_dir = hiera('rhizo::rhizomatica_dir')
-  $sq_hlr_path     = hiera('rhizo::sq_hlr_path')
+  $hlr_db          = hiera('rhizo::hlr_db', '/var/lib/osmocom/hlr.db')
+  $sms_db          = hiera('rhizo::sms_db', '/var/lib/osmocom/sms.db')
   $use_sip         = hiera('rhizo::use_sip')
   $advice_email    = hiera('rhizo::advice_email')
   $charge_scheme   = hiera('rhizo::charge_scheme', 'normal')
diff --git a/modules/rhizo_base/manifests/osmocom.pp b/modules/rhizo_base/manifests/osmocom.pp
index 4385054..a8fc63b 100644
--- a/modules/rhizo_base/manifests/osmocom.pp
+++ b/modules/rhizo_base/manifests/osmocom.pp
@@ -17,6 +17,7 @@ class rhizo_base::osmocom {
   $smsc_password   = $rhizo_base::smsc_password
   $smpp_password   = $rhizo_base::smpp_password
 
+  $sms_db          = $rhizo_base::sms_db
   $mncc_codec      = $rhizo_base::mncc_codec
 
   $mncc_ip_address = $rhizo_base::mncc_ip_address
diff --git a/modules/rhizo_base/templates/config_values.py.erb b/modules/rhizo_base/templates/config_values.py.erb
index c6a0fc7..9f305d5 100644
--- a/modules/rhizo_base/templates/config_values.py.erb
+++ b/modules/rhizo_base/templates/config_values.py.erb
@@ -10,7 +10,7 @@ JB_in = '<%= @jb_in %>'
 JB_out = '<%= @jb_out %>'
 
 rhizomatica_dir = '<%= @rhizomatica_dir %>'
-sq_hlr_path = '<%= @sq_hlr_path %>'
+sq_hlr_path = '<%= @hlr_db %>'
 use_sip = '<%= @use_sip %>'
 advice_email = <%= @advice_email %>
 test_playback = '<%= @test_playback %>'
diff --git a/modules/rhizo_base/templates/osmo-msc.cfg.erb b/modules/rhizo_base/templates/osmo-msc.cfg.erb
index 50506df..d6cc169 100644
--- a/modules/rhizo_base/templates/osmo-msc.cfg.erb
+++ b/modules/rhizo_base/templates/osmo-msc.cfg.erb
@@ -66,6 +66,7 @@ network
  rrlp mode none
  mm info 1
 msc
+ sms-database <%= @sms_db %>
  mncc external /tmp/bsc_mncc
  mncc guard-timeout 180
  ncss guard-timeout 30
diff --git a/modules/rhizo_base/templates/rccn-functions.sh.erb b/modules/rhizo_base/templates/rccn-functions.sh.erb
index 1674dfd..dc9dee7 100644
--- a/modules/rhizo_base/templates/rccn-functions.sh.erb
+++ b/modules/rhizo_base/templates/rccn-functions.sh.erb
@@ -2,7 +2,8 @@
 # Shell Functions for Rhizomatica Community Celular Network
 #
 
-OSMO_HLR="<%= @sq_hlr_path %>"
+OSMO_HLR="<%= @hlr_db %>"
+OSMO_SMS="<%= @sms_db %>"
 DID="<%= @voip_did %>"
 
 waitfor0calls () {
@@ -43,6 +44,10 @@ hlr() {
   sudo /usr/bin/sqlite3 -column -header $OSMO_HLR
 }
 
+sms() {
+  sudo /usr/bin/sqlite3 -column -header $OSMO_SMS
+}
+
 tl() {
   if [ "$1" == "" ] ; then
     tail -f /var/log/rccn/*log