X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Frtc.pp;h=26a6e52fd6b94820b7fc642d4ff015c3fa7aaf02;hb=92f3de5dba7a9db8ead8e4c08fae114f5308f158;hp=3dfa8b5dcb99ffb5bf4de5b15765264072a3c354;hpb=44e62e7e78c90b21f9c273f4e6bc604e5604a640;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/rtc.pp b/modules/roles/manifests/rtc.pp
index 3dfa8b5dc..26a6e52fd 100644
--- a/modules/roles/manifests/rtc.pp
+++ b/modules/roles/manifests/rtc.pp
@@ -18,73 +18,73 @@ class roles::rtc {
 		hostname => $::fqdn,
 	}
 
-	@ferm::rule { 'dsa-xmpp-client-ip4':
+	ferm::rule { 'dsa-xmpp-client-ip4':
 		domain      => 'ip',
 		description => 'XMPP connections (client to server)',
 		rule        => 'proto tcp dport (5222) ACCEPT'
 	}
-	@ferm::rule { 'dsa-xmpp-client-ip6':
+	ferm::rule { 'dsa-xmpp-client-ip6':
 		domain      => 'ip6',
 		description => 'XMPP connections (client to server)',
 		rule        => 'proto tcp dport (5222) ACCEPT'
 	}
-	@ferm::rule { 'dsa-xmpp-server-ip4':
+	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':
+	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':
+	ferm::rule { 'dsa-sip-ws-ip4':
 		domain      => 'ip',
 		description => 'SIP connections (WebSocket; for WebRTC)',
 		rule        => 'proto tcp dport (443) ACCEPT'
 	}
-	@ferm::rule { 'dsa-sip-ws-ip6':
+	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':
+	ferm::rule { 'dsa-sip-tls-ip4':
 		domain      => 'ip',
 		description => 'SIP connections (TLS)',
 		rule        => 'proto tcp dport (5061) ACCEPT'
 	}
-	@ferm::rule { 'dsa-sip-tls-ip6':
+	ferm::rule { 'dsa-sip-tls-ip6':
 		domain      => 'ip6',
 		description => 'SIP connections (TLS)',
 		rule        => 'proto tcp dport (5061) ACCEPT'
 	}
-	@ferm::rule { 'dsa-turn-ip4':
+	ferm::rule { 'dsa-turn-ip4':
 		domain      => 'ip',
 		description => 'TURN connections',
 		rule        => 'proto udp dport (3478) ACCEPT'
 	}
-	@ferm::rule { 'dsa-turn-ip6':
+	ferm::rule { 'dsa-turn-ip6':
 		domain      => 'ip6',
 		description => 'TURN connections',
 		rule        => 'proto udp dport (3478) ACCEPT'
 	}
-	@ferm::rule { 'dsa-turn-tls-ip4':
+	ferm::rule { 'dsa-turn-tls-ip4':
 		domain      => 'ip',
 		description => 'TURN connections (TLS)',
 		rule        => 'proto tcp dport (5349) ACCEPT'
 	}
-	@ferm::rule { 'dsa-turn-tls-ip6':
+	ferm::rule { 'dsa-turn-tls-ip6':
 		domain      => 'ip6',
 		description => 'TURN connections (TLS)',
 		rule        => 'proto tcp dport (5349) ACCEPT'
 	}
-	@ferm::rule { 'dsa-rtp-ip4':
+	ferm::rule { 'dsa-rtp-ip4':
 		domain      => 'ip',
 		description => 'RTP streams',
 		rule        => 'proto udp dport (49152:65535) ACCEPT'
 	}
-	@ferm::rule { 'dsa-rtp-ip6':
+	ferm::rule { 'dsa-rtp-ip6':
 		domain      => 'ip6',
 		description => 'RTP streams',
 		rule        => 'proto udp dport (49152:65535) ACCEPT'
@@ -97,6 +97,12 @@ class roles::rtc {
 	service { 'repro':
 		ensure  => running,
 	}
+	dsa_systemd::override { 'repro':
+		content  => @("EOF"),
+			[Unit]
+			After=network-online.target
+			| EOF
+	}
 
 	package { 'freeradius':
 		ensure	=> installed,