From bae5ed99a5e966300b7dae7acb47093cf8c2f082 Mon Sep 17 00:00:00 2001
From: Monocots <gitmaster@rhizomatica.org>
Date: Sat, 10 Aug 2019 08:14:23 +0000
Subject: [PATCH] Continue to run nitb from runit for the moment

Ensure both possible; osmo-nitb, osmocom-nitb systemd
services are stopped and disabled.
---
 modules/rhizo_base/manifests/openbsc.pp |  2 ++
 modules/rhizo_base/manifests/runit.pp   | 12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/rhizo_base/manifests/openbsc.pp b/modules/rhizo_base/manifests/openbsc.pp
index fcecf11..097db00 100644
--- a/modules/rhizo_base/manifests/openbsc.pp
+++ b/modules/rhizo_base/manifests/openbsc.pp
@@ -54,11 +54,13 @@ class rhizo_base::openbsc {
 
   service { 'osmocom-nitb':
       enable  => false,
+      ensure  => 'stopped',
       require => Package['osmocom-nitb'],
     }
 
   service { 'osmo-nitb':
       enable  => false,
+      ensure  => 'stopped',
       require => Package['osmocom-nitb'],
     }
 
diff --git a/modules/rhizo_base/manifests/runit.pp b/modules/rhizo_base/manifests/runit.pp
index 28050a8..db7b455 100644
--- a/modules/rhizo_base/manifests/runit.pp
+++ b/modules/rhizo_base/manifests/runit.pp
@@ -19,12 +19,12 @@ class rhizo_base::runit {
       require => Class['rhizo_base::packages'],
     }
 
-#  file { '/etc/service/osmo-nitb':
-#      ensure  => link,
-#      target  => '/etc/sv/osmo-nitb',
-#      require =>
-#        [ File['/etc/sv'], Class['rhizo_base::openbsc'] ],
-#    }
+  file { '/etc/service/osmo-nitb':
+      ensure  => link,
+      target  => '/etc/sv/osmo-nitb',
+      require =>
+        [ File['/etc/sv'], Class['rhizo_base::openbsc'] ],
+    }
 
   if $operatingsystem != 'Debian' {
     file { '/etc/service/freeswitch':