From d1764ec9f6e59083e93fb290d5d7cedcd85ca37e Mon Sep 17 00:00:00 2001
From: AlexanderDCrane <40072887+AlexanderDCrane@users.noreply.github.com>
Date: Fri, 28 Sep 2018 13:04:54 -0600
Subject: [PATCH] Update {$mac}.cfg (#3616)

---
 .../provision/yealink/t42g/{$mac}.cfg         | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/resources/templates/provision/yealink/t42g/{$mac}.cfg b/resources/templates/provision/yealink/t42g/{$mac}.cfg
index dbe8b4556c..b9589a65a8 100644
--- a/resources/templates/provision/yealink/t42g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t42g/{$mac}.cfg
@@ -512,7 +512,11 @@ account.2.label = {$account.2.display_name}
 account.2.display_name = {$account.2.display_name}
 account.2.auth_name = {$account.2.auth_id}
 account.2.password = {$account.2.password}
+{if isset($account.2.server.1.address)}
+account.2.user_name = {$account.2.user_id}@{$account.2.server_address}
+{else}
 account.2.user_name = {$account.2.user_id}
+{/if}
 account.2.sip_server_host = {$account.2.server_address}
 account.2.sip_server_port = {$account.2.sip_port}
 account.2.outbound_host = {$account.2.outbound_proxy}
@@ -994,7 +998,11 @@ account.3.label = {$account.3.display_name}
 account.3.display_name = {$account.3.display_name}
 account.3.auth_name = {$account.3.auth_id}
 account.3.password = {$account.3.password}
+{if isset($account.3.server.1.address)}
+account.3.user_name = {$account.3.user_id}@{$account.3.server_address}
+{else}
 account.3.user_name = {$account.3.user_id}
+{/if}
 account.3.sip_server_host = {$account.3.server_address}
 account.3.sip_server_port = {$account.3.sip_port}
 account.3.outbound_host = {$account.3.outbound_proxy}
@@ -1466,7 +1474,11 @@ account.4.label = {$account.4.display_name}
 account.4.display_name = {$account.4.display_name}
 account.4.auth_name = {$account.4.auth_id}
 account.4.password = {$account.4.password}
+{if isset($account.4.server.1.address)}
+account.4.user_name = {$account.4.user_id}@{$account.4.server_address}
+{else}
 account.4.user_name = {$account.4.user_id}
+{/if}
 account.4.sip_server_host = {$account.4.server_address}
 account.4.sip_server_port = {$account.4.sip_port}
 account.4.outbound_host = {$account.4.outbound_proxy}
@@ -1938,7 +1950,11 @@ account.5.label = {$account.5.display_name}
 account.5.display_name = {$account.5.display_name}
 account.5.auth_name = {$account.5.auth_id}
 account.5.password = {$account.5.password}
+{if isset($account.5.server.1.address)}
+account.5.user_name = {$account.5.user_id}@{$account.5.server_address}
+{else}
 account.5.user_name = {$account.5.user_id}
+{/if}
 account.5.sip_server_host = {$account.5.server_address}
 account.5.sip_server_port = {$account.5.sip_port}
 account.5.outbound_host = {$account.5.outbound_proxy}
@@ -2410,7 +2426,11 @@ account.6.label = {$account.6.display_name}
 account.6.display_name = {$account.6.display_name}
 account.6.auth_name = {$account.6.auth_id}
 account.6.password = {$account.6.password}
+{if isset($account.6.server.1.address)}
+account.6.user_name = {$account.6.user_id}@{$account.6.server_address}
+{else}
 account.6.user_name = {$account.6.user_id}
+{/if}
 account.6.sip_server_host = {$account.6.server_address}
 account.6.sip_server_port = {$account.6.sip_port}
 account.6.outbound_host = {$account.6.outbound_proxy}