X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Frtc.pp;h=888b1137c28ef9db229e8524359676ab7951cdd0;hb=96cd3ed6d32efe39605dd9b661fa759c4600f6bf;hp=5f1d47befd3c3931878afb642517caac0f67baaa;hpb=b3825db17af7d9ce381b433650f0f03d3a0767bf;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/rtc.pp b/modules/roles/manifests/rtc.pp
index 5f1d47bef..888b1137c 100644
--- a/modules/roles/manifests/rtc.pp
+++ b/modules/roles/manifests/rtc.pp
@@ -1,40 +1,40 @@
 class roles::rtc {
-	include concat
 
 	ssl::service { 'www.debian.org':
+		tlsaport => [],
+		notify  => Service['repro'],
 	}
 
 	ssl::service { 'sip-ws.debian.org':
+		tlsaport => [],
 	}
 
-	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'],
+	dnsextras::tlsa_record{ 'tlsa-xmpp':
+		zone     => 'debian.org',
+		certfile => "/etc/puppet/modules/ssl/files/servicecerts/www.debian.org.crt",
+		port     => [5061, 5222, 5269],
+		hostname => $::fqdn,
 	}
 
-	concat { '/etc/repro/sip-ws.debian.org-chained.crt':
+	@ferm::rule { 'dsa-xmpp-client-ip4':
+		domain      => 'ip',
+		description => 'XMPP connections (client to server)',
+		rule        => 'proto tcp dport (5222) ACCEPT'
 	}
-	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'],
+	@ferm::rule { 'dsa-xmpp-client-ip6':
+		domain      => 'ip6',
+		description => 'XMPP connections (client to server)',
+		rule        => 'proto tcp dport (5222) ACCEPT'
 	}
-	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-server-ip4':
+		domain      => 'ip',
+		description => 'XMPP connections (server to server)',
+		rule        => 'proto tcp dport (5269) ACCEPT'
+	}
+	@ferm::rule { 'dsa-xmpp-server-ip6':
+		domain      => 'ip6',
+		description => 'XMPP connections (server to server)',
+		rule        => 'proto tcp dport (5269) ACCEPT'
 	}
 
 	@ferm::rule { 'dsa-sip-ws-ip4':
@@ -89,7 +89,10 @@ class roles::rtc {
 	}
 
 	file { '/etc/monit/monit.d/50rtc':
-		source  => 'puppet:///modules/roles/rtc/monit',
-		mode    => '0440'
+		ensure  => absent,
+	}
+
+	service { 'repro':
+		ensure  => running,
 	}
 }