projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not ship sbin/mirror-health from the roles version while we migrate
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
rtc.pp
diff --git
a/modules/roles/manifests/rtc.pp
b/modules/roles/manifests/rtc.pp
index
b505764
..
26a6e52
100644
(file)
--- a/
modules/roles/manifests/rtc.pp
+++ b/
modules/roles/manifests/rtc.pp
@@
-18,73
+18,73
@@
class roles::rtc {
hostname => $::fqdn,
}
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'
}
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'
}
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'
}
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'
}
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'
}
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'
}
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'
}
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'
}
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'
}
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'
}
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'
}
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'
}
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'
}
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'
domain => 'ip6',
description => 'RTP streams',
rule => 'proto udp dport (49152:65535) ACCEPT'
@@
-97,6
+97,12
@@
class roles::rtc {
service { 'repro':
ensure => running,
}
service { 'repro':
ensure => running,
}
+ dsa_systemd::override { 'repro':
+ content => @("EOF"),
+ [Unit]
+ After=network-online.target
+ | EOF
+ }
package { 'freeradius':
ensure => installed,
package { 'freeradius':
ensure => installed,
@@
-124,9
+130,7
@@
class roles::rtc {
target => '../mods-available/passwd_rtc',
}
file { '/etc/repro/radius-servers':
target => '../mods-available/passwd_rtc',
}
file { '/etc/repro/radius-servers':
- content => @(EOF),
- localhost/localhost ${radius_password}
- | EOF
+ content => inline_template('localhost/localhost <%= @radius_password %>'),
mode => '0440',
group => repro,
notify => Service['repro'],
mode => '0440',
group => repro,
notify => Service['repro'],