X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsip.pp;h=324bb15baf32dd92990dde8542679a55bfefe3d4;hb=5022b517840424d7ca7fb87b9c5868d91f83db5d;hp=c04ce5dbfaa5bacbc331c37e25dddcbd97af5e66;hpb=542dc9b494931d4e0abd26890b27f34b009f7859;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/sip.pp b/modules/roles/manifests/sip.pp
index c04ce5dbf..324bb15ba 100644
--- a/modules/roles/manifests/sip.pp
+++ b/modules/roles/manifests/sip.pp
@@ -1,22 +1,72 @@
 class roles::sip {
-	@ferm::rule { 'sip-ws':
+	include concat::setup
+
+	ssl::service { 'www.debian.org':
+	}
+
+	concat { '/etc/ssl/debian/certs/www.debian.org-chained.crt':
+	}
+	concat::fragment { '/etc/ssl/debian/certs/www.debian.org.crt':
+		target      => '/etc/ssl/debian/certs/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/ssl/debian/certs/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']
+	}
+
+	@ferm::rule { 'dsa-sip-ws-ip4':
 		domain      => 'ip',
-		description => 'SIP over WebSocket (for WebRTC)',
-		rule        => 'proto tcp mod state state (NEW) dport (443) ACCEPT'
+		description => 'SIP connections (WebSocket; for WebRTC)',
+		rule        => 'proto tcp dport (443) ACCEPT'
 	}
-	@ferm::rule { 'sip':
+	@ferm::rule { 'dsa-sip-ws-ip6':
+		domain      => 'ip6',
+		description => 'SIP connections (WebSocket; for WebRTC)',
+		rule        => 'proto tcp dport (443) ACCEPT'
+	}
+	@ferm::rule { 'dsa-sip-tls-ip4':
 		domain      => 'ip',
 		description => 'SIP connections (TLS)',
-		rule        => 'proto tcp mod state state (NEW) dport (5061) ACCEPT'
+		rule        => 'proto tcp dport (5061) ACCEPT'
+	}
+	@ferm::rule { 'dsa-sip-tls-ip6':
+		domain      => 'ip6',
+		description => 'SIP connections (TLS)',
+		rule        => 'proto tcp dport (5061) ACCEPT'
 	}
-	@ferm::rule { 'turn':
+	@ferm::rule { 'dsa-turn-ip4':
+		domain      => 'ip',
+		description => 'TURN connections',
+		rule        => 'proto udp dport (3478) ACCEPT'
+	}
+	@ferm::rule { 'dsa-turn-ip6':
+		domain      => 'ip6',
+		description => 'TURN connections',
+		rule        => 'proto udp dport (3478) ACCEPT'
+	}
+	@ferm::rule { 'dsa-turn-tls-ip4':
 		domain      => 'ip',
 		description => 'TURN connections (TLS)',
-		rule        => 'proto tcp mod state state (NEW) dport (5349) ACCEPT'
+		rule        => 'proto tcp dport (5349) ACCEPT'
 	}
-	@ferm::rule { 'rtp':
+	@ferm::rule { 'dsa-turn-tls-ip6':
+		domain      => 'ip6',
+		description => 'TURN connections (TLS)',
+		rule        => 'proto tcp dport (5349) ACCEPT'
+	}
+	@ferm::rule { 'dsa-rtp-ip4':
 		domain      => 'ip',
 		description => 'RTP streams',
-		rule        => 'proto udp mod state state (NEW) dport (49152:65535) ACCEPT'
+		rule        => 'proto udp dport (49152:65535) ACCEPT'
+	}
+	@ferm::rule { 'dsa-rtp-ip6':
+		domain      => 'ip6',
+		description => 'RTP streams',
+		rule        => 'proto udp dport (49152:65535) ACCEPT'
 	}
 }