keith/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FS: Make mncc IP addr configurable

Browse source
This commit is contained in:
Wile E. Coyote 2019-05-04 17:43:40 +00:00
parent 264e850ce0
commit 53afabc27e
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/rhizo_base/manifests/freeswitch.pp
View file

@ -104,6 +104,7 @@ class rhizo_base::freeswitch::common {
$voip_password = $rhizo_base::voip_password $voip_password = $rhizo_base::voip_password
$voip_proxy = $rhizo_base::voip_proxy $voip_proxy = $rhizo_base::voip_proxy
$sip_central_ip_address = $rhizo_base::sip_central_ip_address $sip_central_ip_address = $rhizo_base::sip_central_ip_address
$mncc_ip_address = $rhizo_base::mncc_ip_address
package { package {
['freeswitch', 'freeswitch-lang-en', ['freeswitch', 'freeswitch-lang-en',

1
modules/rhizo_base/manifests/init.pp
View file

@ -64,6 +64,7 @@ class rhizo_base {
$inter_codec = hiera('rhizo::inter_codec', 'G729') $inter_codec = hiera('rhizo::inter_codec', 'G729')
# IP address # IP address
$mncc_ip_address = hiera('rhizo::mncc_ip_address', '172.16.0.1')
$vpn_ip_address = hiera('rhizo::vpn_ip_address') $vpn_ip_address = hiera('rhizo::vpn_ip_address')
$wan_ip_address = hiera('rhizo::wan_ip_address') $wan_ip_address = hiera('rhizo::wan_ip_address')
$riak_ip_address = hiera('rhizo::riak_ip_address', $vpn_ip_address) $riak_ip_address = hiera('rhizo::riak_ip_address', $vpn_ip_address)

8
modules/rhizo_base/templates/internal.xml.erb
View file

@ -91,9 +91,9 @@
<param name="outbound-codec-prefs" value="$${global_codec_prefs}"/> <param name="outbound-codec-prefs" value="$${global_codec_prefs}"/>
<param name="rtp-timer-name" value="soft"/> <param name="rtp-timer-name" value="soft"/>
<!-- ip address to use for rtp, DO NOT USE HOSTNAMES ONLY IP ADDRESSES --> <!-- 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 --> <!-- 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="hold-music" value="$${hold_music}"/>-->
<param name="apply-nat-acl" value="nat.auto"/> <param name="apply-nat-acl" value="nat.auto"/>
@ -272,8 +272,8 @@
auto - Use guessed ip. auto - Use guessed ip.
auto-nat - Use ip learned from NAT-PMP or UPNP auto-nat - Use ip learned from NAT-PMP or UPNP
--> -->
<param name="ext-rtp-ip" value="172.16.0.1"/> <param name="ext-rtp-ip" value="<%= @mncc_ip_address %>"/>
<param name="ext-sip-ip" value="172.16.0.1"/> <param name="ext-sip-ip" value="<%= @mncc_ip_address %>"/>
<!-- rtp inactivity timeout --> <!-- rtp inactivity timeout -->
<param name="rtp-timeout-sec" value="300"/> <param name="rtp-timeout-sec" value="300"/>