From ce793e0f52809cefcee33fd2b6f6e1c503fb8d26 Mon Sep 17 00:00:00 2001
From: Len <Len-PGH@users.noreply.github.com>
Date: Sun, 17 Sep 2017 21:12:44 -0400
Subject: [PATCH] Update {$mac}.cfg

---
 .../provision/yealink/t32g/{$mac}.cfg         | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/resources/templates/provision/yealink/t32g/{$mac}.cfg b/resources/templates/provision/yealink/t32g/{$mac}.cfg
index 96b0081771..8f1292849d 100644
--- a/resources/templates/provision/yealink/t32g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t32g/{$mac}.cfg
@@ -36,13 +36,14 @@ account.1.sip_server_host = {$server_address_1}
 account.1.sip_server_port = {$sip_port_1}
 
 #Enable or disable the use of the outbound proxy server; 0-Disabled (default), 1-Enabled;
-account.1.outbound_proxy_enable =
+account.1.outbound_proxy_enable = {if isset($outbound_proxy_primary_1)}1{else}0{/if}
 
 #Specify the IP address or domain name of the outbound proxy server.
-account.1.outbound_host = {$outbound_proxy_1}
+account.1.outbound_host = {$outbound_proxy_primary_1}
 
 #Specify the server port, the default value is 5060.
-account.1.outbound_port =
+account.1.outbound_port = {$sip_port_1}
+{if isset($yealink_sip_listen_port)}account.1.sip_listen_port = {$yealink_sip_listen_port}{else}account.1.sip_listen_port = 5060{/if}
 
 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
 {if $sip_transport_1 == 'udp'}account.1.transport = 0{/if}
@@ -52,10 +53,14 @@ account.1.outbound_port =
 
 
 #Configure the address of the backup outbound proxy server.
-account.1.backup_outbound_host =
+account.1.backup_outbound_host = {$outbound_proxy_primary_1}
 
 #Specify the port of the backup outbound proxy server, the default value is 5060.
-account.1.backup_outbound_port =
+{if isset($outbound_proxy_1_port)}
+account.1.backup_outbound_port = $outbound_proxy_secondary_1
+{else}
+account.1.backup_outbound_port = 5060
+{/if}
 
 #Configure the voice mail number of account 1.
 voice_mail.number.1 = {$voicemail_number}
@@ -69,7 +74,11 @@ account.1.srv_ttl_timer_enable =
 
 #Configure the type of DNS-SRV query; 0-UDP, TCP and TLS (default), 1-UDP, 2-TCP, 3-TLS;
 #Require reboot;
-account.1.dns_srv_type =
+
+{if $sip_transport_1 == 'udp'}account.1.dns_srv_type = 0{/if}
+{if $sip_transport_1 == 'tcp'}account.1.dns_srv_type = 2{/if}
+{if $sip_transport_1 == 'tls'}account.1.dns_srv_type = 3{/if}
+
 
 #Enable or disable the anonymous call feature; 0-Disabled (default), 1-Enabled;
 account.1.anonymous_call =