Merge branch 'master' of ssh://handel.debian.org/~/dsa-puppet

[dsa-puppet.git] / modules / roles / manifests / sip.pp

diff --git a/modules/roles/manifests/sip.pp b/modules/roles/manifests/sip.pp
index ae2e1c7265106cab3881e9f322975c47ac3b47f3..b2700307ce055864477a5d12eb808f5a637ce1f6 100644 (file)
--- a/modules/roles/manifests/sip.pp
+++ b/modules/roles/manifests/sip.pp
@@ -1,27 +1,72 @@
 class roles::sip {
-       @ferm::rule { 'dsa-sip-ws':
+       include concat::setup
+
+       ssl::service { 'www.debian.org':
+               # TODO notify concat
+       }
+
+       # TODO concatate in the ssl module?
+       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,
+       }
+       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,
+       }
+
+       @ferm::rule { 'dsa-sip-ws-ip4':
                domain      => 'ip',
                description => 'SIP connections (WebSocket; for WebRTC)',
                rule        => 'proto tcp dport (443) ACCEPT'
        }
-       @ferm::rule { 'dsa-sip-tls':
+       @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 dport (5061) ACCEPT'
        }
-       @ferm::rule { 'dsa-turn':
+       @ferm::rule { 'dsa-sip-tls-ip6':
+               domain      => 'ip6',
+               description => 'SIP connections (TLS)',
+               rule        => 'proto tcp dport (5061) ACCEPT'
+       }
+       @ferm::rule { 'dsa-turn-ip4':
                domain      => 'ip',
                description => 'TURN connections',
                rule        => 'proto udp dport (3478) ACCEPT'
        }
-       @ferm::rule { 'dsa-turn-tls':
+       @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 dport (5349) ACCEPT'
        }
-       @ferm::rule { 'dsa-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 dport (49152:65535) ACCEPT'
        }
+       @ferm::rule { 'dsa-rtp-ip6':
+               domain      => 'ip6',
+               description => 'RTP streams',
+               rule        => 'proto udp dport (49152:65535) ACCEPT'
+       }
 }