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

diff --git a/modules/roles/manifests/rtc.pp b/modules/roles/manifests/rtc.pp
index def41c81c..888b1137c 100644
--- a/modules/roles/manifests/rtc.pp
+++ b/modules/roles/manifests/rtc.pp
@@ -1,39 +1,19 @@
 class roles::rtc {
 
 	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'],
-	}
-
-	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'],
+	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,
 	}
 
 	@ferm::rule { 'dsa-xmpp-client-ip4':
@@ -107,4 +87,12 @@ class roles::rtc {
 		description => 'RTP streams',
 		rule        => 'proto udp dport (49152:65535) ACCEPT'
 	}
+
+	file { '/etc/monit/monit.d/50rtc':
+		ensure  => absent,
+	}
+
+	service { 'repro':
+		ensure  => running,
+	}
 }