From 9ad11cc888db3d407e1d16dc9ab8465568df937a Mon Sep 17 00:00:00 2001
From: AlexanderDCrane <40072887+AlexanderDCrane@users.noreply.github.com>
Date: Wed, 12 Sep 2018 19:06:11 -0600
Subject: [PATCH] Update {$mac}.cfg (#3435)

---
 .../provision/yealink/w60b/{$mac}.cfg         | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/resources/templates/provision/yealink/w60b/{$mac}.cfg b/resources/templates/provision/yealink/w60b/{$mac}.cfg
index c215e05113..c3204494a1 100644
--- a/resources/templates/provision/yealink/w60b/{$mac}.cfg
+++ b/resources/templates/provision/yealink/w60b/{$mac}.cfg
@@ -8,31 +8,31 @@
 #######################################################################################
 
 #Basic Settings
-account.1.enable = {if isset($user_password_1)}1{else}0{/if}{""}
-account.1.label = {$display_name_1}
-account.1.display_name = {$display_name_1}
-account.1.user_name = {$user_id_1}
-account.1.auth_name = {$user_id_1}
-account.1.password = {$user_password_1}
-account.1.sip_server_host = {$server_address_1}
-account.1.sip_server_port = {$sip_port_1}
-account.1.transport = {if $sip_transport_1 == 'udp'}0{/if}{if $sip_transport_1 == 'tcp'}1{/if}{if $sip_transport_1 == 'tls'}2{/if}{if $sip_transport_1 == 'dns srv'}3{/if}{""}
-account.1.expires = {$register_expires_1}
-account.1.outbound_host = {$outbound_proxy_1}
-account.1.outbound_port = {$sip_port_1}
+account.1.enable = {if isset($account.1.user_password)}1{else}0{/if}{""}
+account.1.label = {$account.1.display_name}
+account.1.display_name = {$account.1.display_name}
+account.1.user_name = {$account.1.user_id}
+account.1.auth_name = {$account.1.user_id}
+account.1.password = {$account.1.password}
+account.1.sip_server_host = {$account.1.server_address}
+account.1.sip_server_port = {$account.1.sip_port}
+account.1.transport = {if $account.1.sip_transport == 'udp'}0{/if}{if $account.1.sip_transport == 'tcp'}1{/if}{if $sip_transport_1 == 'tls'}2{/if}{if $sip_transport_1 == 'dns srv'}3{/if}{""}
+account.1.expires = {$account.1.register_expires}
+account.1.outbound_host = {$account.1.outbound_proxy}
+account.1.outbound_port = {$account.1.sip_port}
 
 #Server Redundancy
-account.1.sip_server.2.address= {$server_address_2}
-account.1.sip_server.2.port= {$sip_port_2}
+account.1.sip_server.2.address= {$account.1.server.2.address}
+account.1.sip_server.2.port= {$account.1.sip_port}
 account.1.sip_server.2.transport_type = {if $sip_transport_1 == 'udp'}0{/if}{if $sip_transport_1 == 'tcp'}1{/if}{if $sip_transport_1 == 'tls'}2{/if}{if $sip_transport_1 == 'dns srv'}3{/if}{""}
-account.1.sip_server.2.expires= {$register_expires_2}
+account.1.sip_server.2.expires= {$account.1.register_expires}
 account.1.retry_counts = 3
 
 #Basic Proxy Settings
 account.1.outbound_proxy_enable= {if isset($outbound_proxy_primary_1)}1{else}0{/if}{""}
-account.1.outbound_proxy.1.address = {$outbound_proxy_primary_1}
+account.1.outbound_proxy.1.address = {$account.1.outbound_proxy_primary}
 account.1.outbound_proxy.1.port = {if isset($outbound_proxy_1_port)}{$outbound_proxy_1_port}{else}5060{/if}{""}
-account.1.outbound_proxy.2.address = {$outbound_proxy_secondary_1}
+account.1.outbound_proxy.2.address = {$account.1.outbound_proxy_secondary}
 account.1.outbound_proxy.2.port = {if isset($outbound_proxy_1_port)}{$outbound_proxy_1_port}{else}5060{/if}{""}
 account.1.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}