X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Frtc.pp;h=754367043d9f6cce19d482fcea731aa27eb783b3;hb=7979d10744f00844e4dcaaefe1a4fa5debf57b3e;hp=def41c81c01ab6a9aeff5391dc86c294ec42eb87;hpb=6b4c3f89c833301dbf9e74c1f58ba1b5aa8cf189;p=dsa-puppet.git diff --git a/modules/roles/manifests/rtc.pp b/modules/roles/manifests/rtc.pp index def41c81..75436704 100644 --- a/modules/roles/manifests/rtc.pp +++ b/modules/roles/manifests/rtc.pp @@ -6,36 +6,6 @@ class roles::rtc { ssl::service { 'sip-ws.debian.org': } - concat { '/etc/repro/www.debian.org-chained.crt': - } - concat::fragment { '/etc/ssl/debian/certs/www.debian.org.crt': - target => '/etc/repro/www.debian.org-chained.crt', - source => 'file:///etc/ssl/debian/certs/www.debian.org.crt', - order => 00, - require => File['/etc/ssl/debian/certs/www.debian.org.crt'], - } - concat::fragment { '/etc/ssl/debian/certs/www.debian.org.crt-chain': - target => '/etc/repro/www.debian.org-chained.crt', - source => 'file:///etc/ssl/debian/certs/www.debian.org.crt-chain', - order => 99, - require => File['/etc/ssl/debian/certs/www.debian.org.crt-chain'], - } - - concat { '/etc/repro/sip-ws.debian.org-chained.crt': - } - concat::fragment { '/etc/ssl/debian/certs/sip-ws.debian.org.crt': - target => '/etc/repro/sip-ws.debian.org-chained.crt', - source => 'file:///etc/ssl/debian/certs/sip-ws.debian.org.crt', - order => 00, - require => File['/etc/ssl/debian/certs/sip-ws.debian.org.crt'], - } - concat::fragment { '/etc/ssl/debian/certs/sip-ws.debian.org.crt-chain': - target => '/etc/repro/sip-ws.debian.org-chained.crt', - source => 'file:///etc/ssl/debian/certs/sip-ws.debian.org.crt-chain', - order => 99, - require => File['/etc/ssl/debian/certs/sip-ws.debian.org.crt-chain'], - } - @ferm::rule { 'dsa-xmpp-client-ip4': domain => 'ip', description => 'XMPP connections (client to server)', @@ -107,4 +77,8 @@ class roles::rtc { description => 'RTP streams', rule => 'proto udp dport (49152:65535) ACCEPT' } + + file { '/etc/monit/monit.d/50rtc': + ensure => absent, + } }