From 7d506eb4bef8f90dbe9b5f733ddce6547f423c90 Mon Sep 17 00:00:00 2001
From: "Wile E. Coyote" <rhizomatica@rhizomatica.org>
Date: Thu, 15 Nov 2018 15:31:40 +0000
Subject: [PATCH] SMS: Add a switch to use_kannel (or not)

If we don't use kannel, then create the runit link in /etc/service
to run the python esme.
---
 modules/rhizo_base/files/etc/sv/esme/log/run  |  4 ++++
 modules/rhizo_base/files/etc/sv/esme/run      |  3 +++
 modules/rhizo_base/files/osmo-nitb.run        |  4 ++++
 .../sv/osmo-nitb/run => osmo-nitb.run.kannel} |  0
 modules/rhizo_base/manifests/init.pp          |  1 +
 modules/rhizo_base/manifests/runit.pp         | 24 +++++++++++++++++++
 .../rhizo_base/templates/config_values.py.erb |  1 +
 7 files changed, 37 insertions(+)
 create mode 100755 modules/rhizo_base/files/etc/sv/esme/log/run
 create mode 100755 modules/rhizo_base/files/etc/sv/esme/run
 create mode 100755 modules/rhizo_base/files/osmo-nitb.run
 rename modules/rhizo_base/files/{etc/sv/osmo-nitb/run => osmo-nitb.run.kannel} (100%)

diff --git a/modules/rhizo_base/files/etc/sv/esme/log/run b/modules/rhizo_base/files/etc/sv/esme/log/run
new file mode 100755
index 0000000..cf4e69a
--- /dev/null
+++ b/modules/rhizo_base/files/etc/sv/esme/log/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+LOG_FOLDER=/var/log/esme
+mkdir -p $LOG_FOLDER
+exec svlogd -tt $LOG_FOLDER
\ No newline at end of file
diff --git a/modules/rhizo_base/files/etc/sv/esme/run b/modules/rhizo_base/files/etc/sv/esme/run
new file mode 100755
index 0000000..b712b9e
--- /dev/null
+++ b/modules/rhizo_base/files/etc/sv/esme/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+export PYTHONPATH=$PYTHONPATH:/var/rhizomatica/rccn
+exec python /var/rhizomatica/rccn/esme.py
diff --git a/modules/rhizo_base/files/osmo-nitb.run b/modules/rhizo_base/files/osmo-nitb.run
new file mode 100755
index 0000000..36fbcd2
--- /dev/null
+++ b/modules/rhizo_base/files/osmo-nitb.run
@@ -0,0 +1,4 @@
+#!/bin/sh
+ulimit -c unlimited
+exec 2>&1
+exec chrt 10 /usr/bin/osmo-nitb -C -P -m -c /etc/osmocom/osmo-nitb.cfg -l /var/lib/osmocom/hlr.sqlite3
diff --git a/modules/rhizo_base/files/etc/sv/osmo-nitb/run b/modules/rhizo_base/files/osmo-nitb.run.kannel
similarity index 100%
rename from modules/rhizo_base/files/etc/sv/osmo-nitb/run
rename to modules/rhizo_base/files/osmo-nitb.run.kannel
diff --git a/modules/rhizo_base/manifests/init.pp b/modules/rhizo_base/manifests/init.pp
index adfbbcc..69e54ae 100644
--- a/modules/rhizo_base/manifests/init.pp
+++ b/modules/rhizo_base/manifests/init.pp
@@ -90,6 +90,7 @@ class rhizo_base {
   $kannel_port             = hiera('rhizo::kannel_port')
   $kannel_username         = hiera('rhizo::kannel_username')
   $kannel_sendsms_password = hiera('rhizo::kannel_sendsms_password')
+  $use_kannel              = hiera('rhizo::use_kannel', 'yes')
 
   # VOIP provider
   $voip_provider_name = hiera('rhizo::voip_provider_name')
diff --git a/modules/rhizo_base/manifests/runit.pp b/modules/rhizo_base/manifests/runit.pp
index 5a32c55..9ad4c5e 100644
--- a/modules/rhizo_base/manifests/runit.pp
+++ b/modules/rhizo_base/manifests/runit.pp
@@ -18,6 +18,30 @@ class rhizo_base::runit {
       require => Class['rhizo_base::packages'],
     }
 
+  if $use_kannel == 'yes' {
+
+    file { '/etc/sv/osmo-nitb/run':
+        ensure  => present,
+        source  => 'puppet:///modules/rhizo_base/osmo-nitb.run.kannel',
+        require => File['/etc/sv'],
+      }
+  }
+
+  if $use_kannel == 'no' {
+
+    file { '/etc/sv/osmo-nitb/run':
+        ensure  => present,
+        source  => 'puppet:///modules/rhizo_base/osmo-nitb.run',
+        require => File['/etc/sv'],
+      }
+
+    file { '/etc/service/esme':
+        ensure  => link,
+        target  => '/etc/sv/esme',
+        require => File['/etc/sv'],
+      }
+  }
+
   file { '/etc/service/osmo-nitb':
       ensure  => link,
       target  => '/etc/sv/osmo-nitb',
diff --git a/modules/rhizo_base/templates/config_values.py.erb b/modules/rhizo_base/templates/config_values.py.erb
index 3abc44b..e0813da 100644
--- a/modules/rhizo_base/templates/config_values.py.erb
+++ b/modules/rhizo_base/templates/config_values.py.erb
@@ -56,6 +56,7 @@ kannel_server = '<%= @kannel_server %>'
 kannel_port = <%= @kannel_port %>
 kannel_username = '<%= @kannel_username %>'
 kannel_password = '<%= @kannel_sendsms_password %>'
+use_kannel = '<%= @use_kannel %>'
 
 # VOIP provider
 voip_provider_name = "<%= @voip_provider_name %>"