From 680e0b53e27c81da9a24f11ee905efe15d7dce9f Mon Sep 17 00:00:00 2001
From: Keith Whyte <keith@rhizomatica.org>
Date: Wed, 21 Oct 2020 18:18:49 +0200
Subject: [PATCH] MSC: use systemd dropin override

Use override file instead of writing the unit service file directly.
---
 modules/rhizo_base/files/systemd/osmo-msc.override | 3 +++
 modules/rhizo_base/manifests/osmocom.pp            | 9 +++++----
 2 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 modules/rhizo_base/files/systemd/osmo-msc.override

diff --git a/modules/rhizo_base/files/systemd/osmo-msc.override b/modules/rhizo_base/files/systemd/osmo-msc.override
new file mode 100644
index 0000000..79771bc
--- /dev/null
+++ b/modules/rhizo_base/files/systemd/osmo-msc.override
@@ -0,0 +1,3 @@
+[Service]
+ExecStart=
+ExecStart=/usr/bin/osmo-msc -c /etc/osmocom/osmo-msc.cfg -l /var/lib/osmocom/sms.db
diff --git a/modules/rhizo_base/manifests/osmocom.pp b/modules/rhizo_base/manifests/osmocom.pp
index d2d83b6..238914a 100644
--- a/modules/rhizo_base/manifests/osmocom.pp
+++ b/modules/rhizo_base/manifests/osmocom.pp
@@ -9,6 +9,7 @@
 
 class rhizo_base::osmocom {
 
+  include systemd
   $network_name    = $rhizo_base::network_name
   $mcc             = $rhizo_base::mcc
   $mnc             = $rhizo_base::mnc
@@ -131,10 +132,10 @@ class rhizo_base::osmocom {
       require => Package['osmo-sip-connector'],
     }
 
-  file { '/lib/systemd/system/osmo-msc.service':
-      ensure   => present,
-      source   => 'puppet:///modules/rhizo_base/systemd/osmo-msc.service',
-    }
+  systemd::dropin_file { 'override.conf':
+      unit    => 'osmo-msc.service',
+      source  => 'puppet:///modules/rhizo_base/systemd/osmo-msc.override'
+  }
 
   file { '/lib/systemd/system/osmo-mgw-msc.service':
       ensure   => present,