diff --git a/modules/rhizo_base/manifests/runit.pp b/modules/rhizo_base/manifests/runit.pp index 80726a2..bc60f1e 100644 --- a/modules/rhizo_base/manifests/runit.pp +++ b/modules/rhizo_base/manifests/runit.pp @@ -28,17 +28,6 @@ class rhizo_base::runit { require => Class['rhizo_base::packages'], } - $_req = $osmo_stack ? { - 'split' => File['/etc/sv'], - 'nitb' => [ File['/etc/sv'], Class['rhizo_base::openbsc'] ], - default => [ File['/etc/sv'], Class['rhizo_base::openbsc'] ], - } - - file { '/etc/service/osmo-nitb': - ensure => link, - target => '/etc/sv/osmo-nitb', - require => $_req, - } if $operatingsystem != 'Debian' { file { '/etc/service/freeswitch': @@ -67,13 +56,25 @@ class rhizo_base::runit { require => [ File['/etc/sv'] ], } - $_runit_sip_con = $osmo_stack ? { + $_runit_svc = $osmo_stack ? { 'split' => absent, 'nitb' => link } + $_req = $osmo_stack ? { + 'split' => File['/etc/sv'], + 'nitb' => [ File['/etc/sv'], Class['rhizo_base::openbsc'] ], + default => [ File['/etc/sv'], Class['rhizo_base::openbsc'] ], + } + + file { '/etc/service/osmo-nitb': + ensure => $_runit_svc, + target => '/etc/sv/osmo-nitb', + require => $_req, + } + file { '/etc/service/osmo-sip-connector': - ensure => $_runit_sip_con, + ensure => $_runit_svc, target => '/etc/sv/osmo-sip-connector', require => [ File['/etc/sv'] ], }