From 49faecf734746b17c7d1939d449712fd43d63610 Mon Sep 17 00:00:00 2001 From: Keith Whyte Date: Sun, 29 Aug 2021 06:59:11 +0200 Subject: [PATCH] Changes to SEMS config to support multi-peer SEMS --- modules/rhizo_base/manifests/sems.pp | 2 ++ modules/rhizo_base/templates/ifname_ext.conf.erb | 1 + modules/rhizo_base/templates/sems.conf.erb | 4 ++++ 3 files changed, 7 insertions(+) diff --git a/modules/rhizo_base/manifests/sems.pp b/modules/rhizo_base/manifests/sems.pp index 469622d..f1bb876 100644 --- a/modules/rhizo_base/manifests/sems.pp +++ b/modules/rhizo_base/manifests/sems.pp @@ -12,10 +12,12 @@ # class rhizo_base::sems { + $prefix = "$rhizo_base::postcode$rhizo_base::pbxcode" $vpn_ip_address = $rhizo_base::vpn_ip_address $vsat_ip_address = hiera('rhizo::vsat_ip_address', '127.0.0.1') $vsat_serv_ip_address = hiera('rhizo::vsat_serv_ip_address', '192.168.12.10') $rtp_mux_port = hiera('rhizo::rtp_mux_port', '5000') + $stream_min = hiera('rhizo::rtp_mux_stream_min', '1') $dids = hiera('rhizo::dids', '') package { ['sems', ]: diff --git a/modules/rhizo_base/templates/ifname_ext.conf.erb b/modules/rhizo_base/templates/ifname_ext.conf.erb index 450e9c8..2926881 100644 --- a/modules/rhizo_base/templates/ifname_ext.conf.erb +++ b/modules/rhizo_base/templates/ifname_ext.conf.erb @@ -1,4 +1,5 @@ <% @dids.each do |did| -%> ^.*_<%= did -%>$=>mux-in <% end -%> +^.*_<%= @prefix %>=>mux-in ^rhizomatica_00.*$=>mux-out diff --git a/modules/rhizo_base/templates/sems.conf.erb b/modules/rhizo_base/templates/sems.conf.erb index ac65d48..c10cd9c 100644 --- a/modules/rhizo_base/templates/sems.conf.erb +++ b/modules/rhizo_base/templates/sems.conf.erb @@ -229,6 +229,10 @@ rtp_mux_max_frame_age_ms=30 # b_rtp_mux_port must be configured in the SBC profile. # +rtp_mux_stream_id_min=<%= @stream_min %> +rtp_mux_stream_id_max=<%= @stream_min+30 %> + + ############################################################ # modules and application configuration #