From 4ddfae65afb0863ba18074975b37ec5351f99c54 Mon Sep 17 00:00:00 2001
From: Len <Len-PGH@users.noreply.github.com>
Date: Fri, 29 Sep 2017 00:42:59 -0400
Subject: [PATCH] Update {$mac}.cfg

---
 .../provision/yealink/t56a/{$mac}.cfg         | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/resources/templates/provision/yealink/t56a/{$mac}.cfg b/resources/templates/provision/yealink/t56a/{$mac}.cfg
index 0d57126c75..2df080cefe 100644
--- a/resources/templates/provision/yealink/t56a/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t56a/{$mac}.cfg
@@ -57,7 +57,7 @@ account.1.outbound_proxy_fallback_interval = 120
 account.1.naptr_build = 0
 account.1.fallback.redundancy_type = 0
 account.1.fallback.timeout = 120
-account.1.sip_server.1.address =
+account.1.sip_server.1.address = {$server_address_1}
 {if $sip_transport_1 == 'dns srv'}
 account.1.sip_server.1.port = 0
 {else}
@@ -87,7 +87,6 @@ account.1.dns_cache_type =
 account.1.static_cache_pri = 
 account.1.register_expires_overlap = 
 account.1.subscribe_expires_overlap =
-
 #######################################################################################
 ##                           Register Advanced                                       ##       
 #######################################################################################
@@ -492,6 +491,7 @@ account.2.auth_name = {$auth_id_2}
 account.2.password = {$user_password_2}
 account.2.user_name = {$user_id_2} 
 account.2.outbound_proxy_enable = {if isset($outbound_proxy_primary_2)}1{else}0{/if}
+
 account.2.outbound_proxy.1.address = {$outbound_proxy_primary_2}
 account.2.outbound_proxy.1.port = 5060
 account.2.dial_tone =
@@ -520,7 +520,7 @@ account.2.outbound_proxy_fallback_interval =
 account.2.naptr_build = 0
 account.2.fallback.redundancy_type = 0
 account.2.fallback.timeout = 120
-account.2.sip_server.1.address =
+account.2.sip_server.1.address = {$server_address_2}
 {if $sip_transport_1 == 'dns srv'}
 account.2.sip_server.1.port = 0
 {else}
@@ -930,6 +930,7 @@ account.3.auth_name = {$auth_id_3}
 account.3.password = {$user_password_3}
 account.3.user_name = {$user_id_3} 
 account.3.outbound_proxy_enable = {if isset($outbound_proxy_primary_3)}1{else}0{/if}
+
 account.3.outbound_proxy.1.address = {$outbound_proxy_primary_3}
 account.3.outbound_proxy.1.port = 5060
 account.3.dial_tone =
@@ -959,7 +960,7 @@ account.3.outbound_proxy_fallback_interval =
 account.3.naptr_build = 0
 account.3.fallback.redundancy_type = 0
 account.3.fallback.timeout = 120
-account.3.sip_server.1.address =
+account.3.sip_server.1.address = {$server_address_3}
 {if $sip_transport_1 == 'dns srv'}
 account.3.sip_server.1.port = 0
 {else}
@@ -1367,6 +1368,7 @@ account.4.auth_name = {$auth_id_4}
 account.4.password = {$user_password_4}
 account.4.user_name = {$user_id_4} 
 account.4.outbound_proxy_enable = {if isset($outbound_proxy_primary_4)}1{else}0{/if}
+
 account.4.outbound_proxy.1.address = {$outbound_proxy_primary_4}
 account.4.outbound_proxy.1.port = 5060
 account.4.dial_tone =
@@ -1396,7 +1398,7 @@ account.4.outbound_proxy_fallback_interval =
 account.4.naptr_build = 0
 account.4.fallback.redundancy_type = 0
 account.4.fallback.timeout = 120
-account.4.sip_server.1.address =
+account.4.sip_server.1.address = {$server_address_4}
 {if $sip_transport_1 == 'dns srv'}
 account.4.sip_server.1.port = 0
 {else}
@@ -1812,6 +1814,7 @@ account.5.auth_name = {$auth_id_5}
 account.5.password = {$user_password_5}
 account.5.user_name = {$user_id_5} 
 account.5.outbound_proxy_enable = {if isset($outbound_proxy_primary_5)}1{else}0{/if}
+
 account.5.outbound_proxy.1.address = {$outbound_proxy_primary_5}
 account.5.outbound_proxy.1.port = 5060
 account.5.dial_tone =
@@ -1841,7 +1844,7 @@ account.5.outbound_proxy_fallback_interval =
 account.5.naptr_build = 0
 account.5.fallback.redundancy_type = 0
 account.5.fallback.timeout = 120
-account.5.sip_server.1.address =
+account.5.sip_server.1.address = {$server_address_5}
 {if $sip_transport_1 == 'dns srv'}
 account.5.sip_server.1.port = 0
 {else}
@@ -2258,6 +2261,7 @@ account.6.auth_name = {$auth_id_6}
 account.6.password = {$user_password_6}
 account.6.user_name = {$user_id_6} 
 account.6.outbound_proxy_enable = {if isset($outbound_proxy_primary_6)}1{else}0{/if}
+
 account.6.outbound_proxy.1.address = {$outbound_proxy_primary_6}
 account.6.outbound_proxy.1.port = 5060
 account.6.dial_tone =
@@ -2287,7 +2291,7 @@ account.6.outbound_proxy_fallback_interval =
 account.6.naptr_build = 0
 account.6.fallback.redundancy_type = 0
 account.6.fallback.timeout = 120
-account.6.sip_server.1.address =
+account.6.sip_server.1.address = {$server_address_6}
 {if $sip_transport_1 == 'dns srv'}
 account.6.sip_server.1.port = 0
 {else}
@@ -2867,7 +2871,7 @@ local_time.end_time =
 
 ##It configures the offset time (in minutes).
 ##The default value is blank.Integer from -300 to 300
-local_time.offset_time = 
+local_time.offset_time = {$yealink_time_format}
 
 ##It configures the time format.0-12 Hour,1-24 Hour.
 ##The default value is 1.
@@ -2913,12 +2917,10 @@ static.network.internet_port.type =
 static.network.internet_port.ip =
 static.network.internet_port.mask = 
 static.network.internet_port.gateway =
-static.network.primary_dns=  
+static.network.primary_dns= 
 static.network.secondary_dns = 
 
-#{if isset($dns_server_primary)}static.network.primary_dns = {$dns_server_primary}{/if}
-#{if isset($dns_server_secondary)}static.network.secondary_dns = {$dns_server_secondary}{/if}
-#{if isset($dns_server_primary)}static.network.dns_enable = 1{else}static.network.dns_enable = 0{/if}
+
 
 #######################################################################################
 ##                           V80 Add                                                 ##