From e43baf47d54b5f1baa3799f74464e794f1854c3d Mon Sep 17 00:00:00 2001 From: "Wile E. Coyote" Date: Mon, 12 Feb 2018 09:42:09 +0000 Subject: [PATCH] Remove Kannel --- modules/kannel/manifests/init.pp | 6 +++--- modules/rhizo_base/files/etc/sv/osmo-nitb/run | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/modules/kannel/manifests/init.pp b/modules/kannel/manifests/init.pp index 54a9dd5..d67c2e7 100644 --- a/modules/kannel/manifests/init.pp +++ b/modules/kannel/manifests/init.pp @@ -18,17 +18,17 @@ class kannel ( ) { package { 'kannel': - ensure => present, + ensure => purged, } file { '/etc/kannel/kannel.conf': - ensure => present, + ensure => absent, content => template('kannel/kannel.conf.erb'), require => Package['kannel'], } file { '/etc/default/kannel': - ensure => present, + ensure => absent, source => ['puppet:///modules/kannel/kannel-default'], } diff --git a/modules/rhizo_base/files/etc/sv/osmo-nitb/run b/modules/rhizo_base/files/etc/sv/osmo-nitb/run index 136fe70..36fbcd2 100755 --- a/modules/rhizo_base/files/etc/sv/osmo-nitb/run +++ b/modules/rhizo_base/files/etc/sv/osmo-nitb/run @@ -1,9 +1,4 @@ #!/bin/sh ulimit -c unlimited -/etc/init.d/kannel stop -sleep 10 -#/usr/bin/killall -9 run_kannel_box bearerbox smsbox -ps aux|grep kannel -/etc/init.d/kannel start 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