From d2ad2858c9a22a1c514626060da4152741277740 Mon Sep 17 00:00:00 2001 From: Luca Filipozzi Date: Fri, 17 Jan 2014 06:54:21 +0000 Subject: [PATCH] sip -> rtc rename + monit --- hieradata/common.yaml | 2 +- modules/roles/files/rtc/monit | 7 +++++++ modules/roles/manifests/init.pp | 4 ++-- modules/roles/manifests/{sip.pp => rtc.pp} | 7 ++++++- 4 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 modules/roles/files/rtc/monit rename modules/roles/manifests/{sip.pp => rtc.pp} (95%) diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 3e1847da..10d791f7 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -70,7 +70,7 @@ roles: - chopin.debian.org security_tracker: - soler.debian.org - sip: + rtc: - vogler.debian.org sso: - diabelli.debian.org diff --git a/modules/roles/files/rtc/monit b/modules/roles/files/rtc/monit new file mode 100644 index 00000000..20c703bd --- /dev/null +++ b/modules/roles/files/rtc/monit @@ -0,0 +1,7 @@ +check process repro with pidfile /var/run/repro/repro.pid + start program = "/usr/sbin/service repro start" + stop program = "/usr/sbin/service repro stop" + +check process reTurnServer with pidfile /var/run/reTurnServer/reTurnServer.pid + start program = "/usr/sbin/service resiprocate-turn-server start" + stop program = "/usr/sbin/service resiprocate-turn-server stop" diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp index 8159e8cd..5f106c38 100644 --- a/modules/roles/manifests/init.pp +++ b/modules/roles/manifests/init.pp @@ -160,7 +160,7 @@ class roles { include roles::release } - if has_role('sip') { - include roles::sip + if has_role('rtc') { + include roles::rtc } } diff --git a/modules/roles/manifests/sip.pp b/modules/roles/manifests/rtc.pp similarity index 95% rename from modules/roles/manifests/sip.pp rename to modules/roles/manifests/rtc.pp index 3b1973ae..2609e5d4 100644 --- a/modules/roles/manifests/sip.pp +++ b/modules/roles/manifests/rtc.pp @@ -1,4 +1,4 @@ -class roles::sip { +class roles::rtc { include concat::setup ssl::service { 'www.debian.org': @@ -87,4 +87,9 @@ class roles::sip { description => 'RTP streams', rule => 'proto udp dport (49152:65535) ACCEPT' } + + file { '/etc/monit/monit.d/50rtc': + source => 'puppet:///modules/roles/rtc/monit', + mode => '0440' + } } -- 2.39.2