From 39c7fa358f43970109e7387278b20c77ab86984b Mon Sep 17 00:00:00 2001 From: Keith Whyte Date: Thu, 11 Mar 2021 08:30:10 +0100 Subject: [PATCH] Fix sems regex map and config typo --- modules/rhizo_base/manifests/sems.pp | 1 + modules/rhizo_base/templates/ifname_ext.conf.erb | 5 +++-- modules/rhizo_base/templates/mux-out.sbcprofile.conf.erb | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/rhizo_base/manifests/sems.pp b/modules/rhizo_base/manifests/sems.pp index 7ec4913..469622d 100644 --- a/modules/rhizo_base/manifests/sems.pp +++ b/modules/rhizo_base/manifests/sems.pp @@ -16,6 +16,7 @@ class rhizo_base::sems { $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') + $dids = hiera('rhizo::dids', '') package { ['sems', ]: ensure => installed, diff --git a/modules/rhizo_base/templates/ifname_ext.conf.erb b/modules/rhizo_base/templates/ifname_ext.conf.erb index f5efed9..450e9c8 100644 --- a/modules/rhizo_base/templates/ifname_ext.conf.erb +++ b/modules/rhizo_base/templates/ifname_ext.conf.erb @@ -1,3 +1,4 @@ -^.*_9519800748$=>mux-in -^.*_9519800756$=>mux-in +<% @dids.each do |did| -%> +^.*_<%= did -%>$=>mux-in +<% end -%> ^rhizomatica_00.*$=>mux-out diff --git a/modules/rhizo_base/templates/mux-out.sbcprofile.conf.erb b/modules/rhizo_base/templates/mux-out.sbcprofile.conf.erb index f95e1dc..fbeac1a 100644 --- a/modules/rhizo_base/templates/mux-out.sbcprofile.conf.erb +++ b/modules/rhizo_base/templates/mux-out.sbcprofile.conf.erb @@ -1,7 +1,7 @@ next_hop=<%= @vsat_serv_ip_address %>:5090 RURI=sip:$rU@<%= @vsat_serv_ip_address %> -b_rtp_mux_ip==<%= @vsat_serv_ip_address %> +b_rtp_mux_ip=<%= @vsat_serv_ip_address %> b_rtp_mux_port=<%= @rtp_mux_port %> enable_rtprelay=yes