From b57981bd76d5d8bf3d1fb5aa0a1064c5cfc41f85 Mon Sep 17 00:00:00 2001 From: Len Date: Wed, 24 Aug 2016 15:01:18 -0400 Subject: [PATCH] Update {$mac}.cfg (#1846) Update outbound proxy support in the Yealink templates. w52p --- .../provision/yealink/w52p/{$mac}.cfg | 71 +++++++++++++------ 1 file changed, 51 insertions(+), 20 deletions(-) diff --git a/resources/templates/provision/yealink/w52p/{$mac}.cfg b/resources/templates/provision/yealink/w52p/{$mac}.cfg index f9bdd28341..ddc33ab686 100644 --- a/resources/templates/provision/yealink/w52p/{$mac}.cfg +++ b/resources/templates/provision/yealink/w52p/{$mac}.cfg @@ -29,7 +29,7 @@ account.1.sip_server_host = {$server_address_1} account.1.sip_server_port = {$sip_port_1} #Enable or disable to use the outbound proxy server; 0-Disabled (default), 1-Enabled; -account.1.outbound_proxy_enable = 1 + #Specify the IP address or domain name of the outbound proxy server. account.1.outbound_host = {$outbound_proxy_1} @@ -43,6 +43,21 @@ account.1.outbound_port = 5060 {if $sip_transport_1 == 'tls'}account.1.transport = 2{/if} {if $sip_transport_1 == 'dns srv'}account.1.transport = 3{/if} +account.1.outbound_proxy.1.address = {$outbound_proxy_primary_1} +account.1.outbound_proxy.2.address = {$outbound_proxy_secondary_1} +account.1.outbound_proxy_enable = {if isset($outbound_proxy_primary_1)}1{else}0{/if} + +{if isset($outbound_proxy_1_port)} +account.1.outbound_proxy.1.port = {$outbound_proxy_1_port} +{else} +account.1.outbound_proxy.1.port = 5060 +{/if} +{if isset($outbound_proxy_1_port)} +account.1.outbound_proxy.2.port = {$outbound_proxy_2_port} +{else} +account.1.outbound_proxy.2.port = 5060 +{/if} + #Configure the address of the backup outbound proxy server. account.1.backup_outbound_host = @@ -80,10 +95,10 @@ account.1.precondition = account.1.subscribe_register = #Enable or disable the phone to subscribe the message waiting indicator; 0-Disabled (default), 1-Enabled; -account.1.subscribe_mwi = 1 +account.1.subscribe_mwi = 0 #Configure MWI subscribe expiry time (in seconds). It ranges from 0 to 84600, the default value is 3600. -account.1.subscribe_mwi_expires = +account.1.subscribe_mwi_expires = 3600 #Configure the type of SIP header to carry the caller ID; 0-FROM (default), 1-PAI; account.1.cid_source = @@ -107,7 +122,7 @@ account.1.srtp_encryption = account.1.ptime = #Enable or disable the phone to subscribe to the voicemail through the message waiting indicator; 0-Disabled (default), 1-Enabled; -account.1.subscribe_mwi_to_vm = +account.1.subscribe_mwi_to_vm = 0 #Enable or disable the phone to send the MAC address in the Register message; 0-Disabled (default), 1-Enabled; account.1.register_mac = @@ -270,7 +285,7 @@ account.2.sip_server_host = {$server_address_2} account.2.sip_server_port = {$sip_port_2} #Enable or disable to use the outbound proxy server; 0-Disabled (default), 1-Enabled; -account.2.outbound_proxy_enable = + #Specify the IP address or domain name of the outbound proxy server. account.2.outbound_host = @@ -284,6 +299,10 @@ account.2.outbound_port =5060 {if $sip_transport_2 == 'tls'}account.2.transport = 2{/if} {if $sip_transport_2 == 'dns srv'}account.2.transport = 3{/if} +account.2.outbound_proxy.1.address = {$outbound_proxy_primary_2} +account.2.outbound_proxy.2.address = {$outbound_proxy_secondary_2} +account.2.outbound_proxy_enable = {if isset($outbound_proxy_primary_2)}1{else}0{/if} + #Configure the address of the backup outbound proxy server. account.2.backup_outbound_host = @@ -321,10 +340,10 @@ account.2.precondition = account.2.subscribe_register = #Enable or disable the phone to subscribe the message waiting indicator; 0-Disabled (default), 1-Enabled; -account.2.subscribe_mwi = +account.2.subscribe_mwi = 0 #Configure MWI subscribe expiry time (in seconds). It ranges from 0 to 84600, the default value is 3600. -account.2.subscribe_mwi_expires = +account.2.subscribe_mwi_expires = 3600 #Configure the type of SIP header to carry the caller ID; 0-FROM (default), 1-PAI; account.2.cid_source = @@ -348,7 +367,7 @@ account.2.srtp_encryption = account.2.ptime = #Enable or disable the phone to subscribe to the voicemail through the message waiting indicator; 0-Disabled (default), 1-Enabled; -account.2.subscribe_mwi_to_vm = +account.2.subscribe_mwi_to_vm = 0 #Enable or disable the phone to send the MAC address in the Register message; 0-Disabled (default), 1-Enabled; account.2.register_mac = @@ -508,7 +527,7 @@ account.3.sip_server_host = account.3.sip_server_port = {$sip_port_3} #Enable or disable to use the outbound proxy server; 0-Disabled (default), 1-Enabled; -account.3.outbound_proxy_enable = + #Specify the IP address or domain name of the outbound proxy server. account.3.outbound_host = @@ -522,6 +541,10 @@ account.3.outbound_port = {if $sip_transport_3 == 'tls'}account.3.transport = 2{/if} {if $sip_transport_3 == 'dns srv'}account.3.transport = 3{/if} +account.3.outbound_proxy.1.address = {$outbound_proxy_primary_3} +account.3.outbound_proxy.2.address = {$outbound_proxy_secondary_3} +account.3.outbound_proxy_enable = {if isset($outbound_proxy_primary_3)}1{else}0{/if} + #Configure the address of the backup outbound proxy server. account.3.backup_outbound_host = @@ -559,10 +582,10 @@ account.3.precondition = account.3.subscribe_register = #Enable or disable the phone to subscribe the message waiting indicator; 0-Disabled (default), 1-Enabled; -account.3.subscribe_mwi = +account.3.subscribe_mwi = 0 #Configure MWI subscribe expiry time (in seconds). It ranges from 0 to 84600, the default value is 3600. -account.3.subscribe_mwi_expires = +account.3.subscribe_mwi_expires = 3600 #Configure the type of SIP header to carry the caller ID; 0-FROM (default), 1-PAI; account.3.cid_source = @@ -586,7 +609,7 @@ account.3.srtp_encryption = account.3.ptime = #Enable or disable the phone to subscribe to the voicemail through the message waiting indicator; 0-Disabled (default), 1-Enabled; -account.3.subscribe_mwi_to_vm = +account.3.subscribe_mwi_to_vm = 0 #Enable or disable the phone to send the MAC address in the Register message; 0-Disabled (default), 1-Enabled; account.3.register_mac = @@ -747,7 +770,7 @@ account.4.sip_server_host = account.4.sip_server_port = {$sip_port_4} #Enable or disable to use the outbound proxy server; 0-Disabled (default), 1-Enabled; -account.4.outbound_proxy_enable = + #Specify the IP address or domain name of the outbound proxy server. account.4.outbound_host = @@ -761,6 +784,10 @@ account.4.outbound_port = {if $sip_transport_4 == 'tls'}account.4.transport = 2{/if} {if $sip_transport_4 == 'dns srv'}account.4.transport = 3{/if} +account.4.outbound_proxy.1.address = {$outbound_proxy_primary_4} +account.4.outbound_proxy.2.address = {$outbound_proxy_secondary_4} +account.4.outbound_proxy_enable = {if isset($outbound_proxy_primary_4)}1{else}0{/if} + #Configure the address of the backup outbound proxy server. account.4.backup_outbound_host = @@ -799,10 +826,10 @@ account.4.precondition = account.4.subscribe_register = #Enable or disable the phone to subscribe the message waiting indicator; 0-Disabled (default), 1-Enabled; -account.4.subscribe_mwi = +account.4.subscribe_mwi = 0 #Configure MWI subscribe expiry time (in seconds). It ranges from 0 to 84600, the default value is 3600. -account.4.subscribe_mwi_expires = +account.4.subscribe_mwi_expires = 3600 #Configure the type of SIP header to carry the caller ID; 0-FROM (default), 1-PAI; account.4.cid_source = @@ -826,7 +853,7 @@ account.4.srtp_encryption = account.4.ptime = #Enable or disable the phone to subscribe to the voicemail through the message waiting indicator; 0-Disabled (default), 1-Enabled; -account.4.subscribe_mwi_to_vm = +account.4.subscribe_mwi_to_vm = 0 #Enable or disable the phone to send the MAC address in the Register message; 0-Disabled (default), 1-Enabled; account.4.register_mac = @@ -991,7 +1018,7 @@ account.5.sip_server_host = account.5.sip_server_port = {$sip_port_5} #Enable or disable to use the outbound proxy server; 0-Disabled (default), 1-Enabled; -account.5.outbound_proxy_enable = + #Specify the IP address or domain name of the outbound proxy server. account.5.outbound_host = @@ -1005,6 +1032,10 @@ account.5.outbound_port = {if $sip_transport_5 == 'tls'}account.5.transport = 2{/if} {if $sip_transport_5 == 'dns srv'}account.5.transport = 3{/if} +account.5.outbound_proxy.1.address = {$outbound_proxy_primary_5} +account.5.outbound_proxy.2.address = {$outbound_proxy_secondary_5} +account.5.outbound_proxy_enable = {if isset($outbound_proxy_primary_5)}1{else}0{/if} + #Configure the address of the backup outbound proxy server. account.5.backup_outbound_host = @@ -1042,10 +1073,10 @@ account.5.precondition = account.5.subscribe_register = #Enable or disable the phone to subscribe the message waiting indicator; 0-Disabled (default), 1-Enabled; -account.5.subscribe_mwi = +account.5.subscribe_mwi = 0 #Configure MWI subscribe expiry time (in seconds). It ranges from 0 to 84600, the default value is 3600. -account.5.subscribe_mwi_expires = +account.5.subscribe_mwi_expires = 3600 #Configure the type of SIP header to carry the caller ID; 0-FROM (default), 1-PAI; account.5.cid_source = @@ -1069,7 +1100,7 @@ account.5.srtp_encryption = account.5.ptime = #Enable or disable the phone to subscribe to the voicemail through the message waiting indicator; 0-Disabled (default), 1-Enabled; -account.5.subscribe_mwi_to_vm = +account.5.subscribe_mwi_to_vm = 0 #Enable or disable the phone to send the MAC address in the Register message; 0-Disabled (default), 1-Enabled; account.5.register_mac =