From 53afabc27e028e8a5c1641fa0982060b8fa7fa65 Mon Sep 17 00:00:00 2001
From: "Wile E. Coyote" <rhizomatica@rhizomatica.org>
Date: Sat, 4 May 2019 17:43:40 +0000
Subject: [PATCH] FS: Make mncc IP addr configurable

---
 modules/rhizo_base/manifests/freeswitch.pp    | 1 +
 modules/rhizo_base/manifests/init.pp          | 1 +
 modules/rhizo_base/templates/internal.xml.erb | 8 ++++----
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/rhizo_base/manifests/freeswitch.pp b/modules/rhizo_base/manifests/freeswitch.pp
index a579fda..5c417f6 100644
--- a/modules/rhizo_base/manifests/freeswitch.pp
+++ b/modules/rhizo_base/manifests/freeswitch.pp
@@ -104,6 +104,7 @@ class rhizo_base::freeswitch::common {
   $voip_password  = $rhizo_base::voip_password
   $voip_proxy     = $rhizo_base::voip_proxy
   $sip_central_ip_address = $rhizo_base::sip_central_ip_address
+  $mncc_ip_address = $rhizo_base::mncc_ip_address
 
   package {
     ['freeswitch', 'freeswitch-lang-en',
diff --git a/modules/rhizo_base/manifests/init.pp b/modules/rhizo_base/manifests/init.pp
index 2f20ebc..71eb16d 100644
--- a/modules/rhizo_base/manifests/init.pp
+++ b/modules/rhizo_base/manifests/init.pp
@@ -64,6 +64,7 @@ class rhizo_base {
   $inter_codec     = hiera('rhizo::inter_codec', 'G729')
 
   # IP address
+  $mncc_ip_address = hiera('rhizo::mncc_ip_address', '172.16.0.1')
   $vpn_ip_address = hiera('rhizo::vpn_ip_address')
   $wan_ip_address = hiera('rhizo::wan_ip_address')
   $riak_ip_address = hiera('rhizo::riak_ip_address', $vpn_ip_address)
diff --git a/modules/rhizo_base/templates/internal.xml.erb b/modules/rhizo_base/templates/internal.xml.erb
index ebae952..0c0f74b 100644
--- a/modules/rhizo_base/templates/internal.xml.erb
+++ b/modules/rhizo_base/templates/internal.xml.erb
@@ -91,9 +91,9 @@
     <param name="outbound-codec-prefs" value="$${global_codec_prefs}"/>
     <param name="rtp-timer-name" value="soft"/>
     <!-- ip address to use for rtp, DO NOT USE HOSTNAMES ONLY IP ADDRESSES -->
-    <param name="rtp-ip" value="172.16.0.1"/>
+    <param name="rtp-ip" value="<%= @mncc_ip_address %>"/>
     <!-- ip address to bind to, DO NOT USE HOSTNAMES ONLY IP ADDRESSES -->
-    <param name="sip-ip" value="172.16.0.1"/>
+    <param name="sip-ip" value="<%= @mncc_ip_address %>"/>
     <!--<param name="hold-music" value="$${hold_music}"/>-->
     <param name="apply-nat-acl" value="nat.auto"/>
 
@@ -272,8 +272,8 @@
          auto                  - Use guessed ip.
          auto-nat              - Use ip learned from NAT-PMP or UPNP
     -->
-    <param name="ext-rtp-ip" value="172.16.0.1"/>
-    <param name="ext-sip-ip" value="172.16.0.1"/>
+    <param name="ext-rtp-ip" value="<%= @mncc_ip_address %>"/>
+    <param name="ext-sip-ip" value="<%= @mncc_ip_address %>"/>
 
     <!-- rtp inactivity timeout -->
     <param name="rtp-timeout-sec" value="300"/>