From 25e822f9eb098a11e7a482a515d4ad501582c757 Mon Sep 17 00:00:00 2001
From: Len <Len-PGH@users.noreply.github.com>
Date: Mon, 21 Oct 2019 15:32:31 -0400
Subject: [PATCH] Update {$mac}.cfg (#4703)

---
 .../provision/yealink/t41s/{$mac}.cfg         | 235 ++++++------------
 1 file changed, 71 insertions(+), 164 deletions(-)

diff --git a/resources/templates/provision/yealink/t41s/{$mac}.cfg b/resources/templates/provision/yealink/t41s/{$mac}.cfg
index bc7032b807..79a21cafdc 100644
--- a/resources/templates/provision/yealink/t41s/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t41s/{$mac}.cfg
@@ -244,7 +244,7 @@ account.1.bla_subscribe_period = 300
 
 account.1.codec.1.enable = 1
 account.1.codec.1.payload_type = PCMU
-account.1.codec.1.priority = {$yealink_codec_4_priority}
+account.1.codec.1.priority = {$yealink_codec_3_priority}
 account.1.codec.1.rtpmap = 0
 
 account.1.codec.2.enable = 1
@@ -264,7 +264,7 @@ account.1.codec.4.rtpmap = 4
 
 account.1.codec.5.enable = 1
 account.1.codec.5.payload_type = G729
-account.1.codec.5.priority = {$yealink_codec_3_priority}
+account.1.codec.5.priority = {$yealink_codec_4_priority}
 account.1.codec.5.rtpmap = 18
 
 account.1.codec.6.enable = 1
@@ -720,12 +720,12 @@ account.2.bla_subscribe_period = 300
 
 account.2.codec.1.enable = 1
 account.2.codec.1.payload_type = PCMU
-account.2.codec.1.priority = 2
+account.2.codec.1.priority = 3
 account.2.codec.1.rtpmap = 0
 
 account.2.codec.2.enable = 1
 account.2.codec.2.payload_type = PCMA
-account.2.codec.2.priority = 3
+account.2.codec.2.priority = 5
 account.2.codec.2.rtpmap = 8
 
 account.2.codec.3.enable = 0
@@ -740,12 +740,12 @@ account.2.codec.4.rtpmap = 4
 
 account.2.codec.5.enable = 1
 account.2.codec.5.payload_type = G729
-account.2.codec.5.priority = 3
+account.2.codec.5.priority = 4
 account.2.codec.5.rtpmap = 18
 
 account.2.codec.6.enable = 1
 account.2.codec.6.payload_type = G722
-account.2.codec.6.priority = 1
+account.2.codec.6.priority = 2
 account.2.codec.6.rtpmap = 9
 
 account.2.codec.7.enable = 0
@@ -988,40 +988,6 @@ local_time.time_zone = {$yealink_time_zone}
 local_time.time_zone_name = {$yealink_time_zone_name}
 
 
-#######################################################################################
-##                                   NETWORK                                         ##
-#######################################################################################
-##0-ipv4, 1-ipv6, 2-ipv4&ipv6
-network.ip_address_mode = 2
-
-network.ipv6_prefix = 64
-network.ipv6_internet_port.type =
-network.ipv6_internet_port.ip =
-network.ipv6_internet_port.gateway =
-network.ipv6_primary_dns =
-network.ipv6_secondary_dns =
-network.ipv6_icmp_v6.enable =
-
-#Configure the WAN port type; 0-DHCP (default), 1-PPPoE, 2-Static IP Address;
-#Require reboot;
-network.internet_port.type =
-
-#Configure the static IP address, subnet mask, gateway and DNS server;
-#Require Reboot;
-network.internet_port.ip =
-network.internet_port.mask =
-network.internet_port.gateway =
-{if isset($dns_server_primary)}
-network.primary_dns = {$dns_server_primary}
-{/if}
-{if isset($dns_server_secondary)}
-network.secondary_dns = {$dns_server_secondary}
-{/if}
-{if isset($dns_server_primary)}
-network.static_dns_enable = 1
-{else}network.static_dns_enable = 0
-{/if}
-
 #######################################################################################
 ##                           Account 3 Basic Settings                                ##
 #######################################################################################
@@ -1240,12 +1206,12 @@ account.3.bla_subscribe_period = 300
 
 account.3.codec.1.enable = 1
 account.3.codec.1.payload_type = PCMU
-account.3.codec.1.priority = 2
+account.3.codec.1.priority = 3
 account.3.codec.1.rtpmap = 0
 
 account.3.codec.2.enable = 1
 account.3.codec.2.payload_type = PCMA
-account.3.codec.2.priority = 3
+account.3.codec.2.priority = 5
 account.3.codec.2.rtpmap = 8
 
 account.3.codec.3.enable = 0
@@ -1260,12 +1226,12 @@ account.3.codec.4.rtpmap = 4
 
 account.3.codec.5.enable = 1
 account.3.codec.5.payload_type = G729
-account.3.codec.5.priority = 3
+account.3.codec.5.priority = 4
 account.3.codec.5.rtpmap = 18
 
 account.3.codec.6.enable = 1
 account.3.codec.6.payload_type = G722
-account.3.codec.6.priority = 1
+account.3.codec.6.priority = 2
 account.3.codec.6.rtpmap = 9
 
 account.3.codec.7.enable = 0
@@ -1499,33 +1465,6 @@ account.3.xsi.server_type =
 account.3.xsi.port =
 
 
-#######################################################################################
-##                                   NETWORK                                         ##
-#######################################################################################
-##0-ipv4, 1-ipv6, 2-ipv4&ipv6
-network.ip_address_mode = 2
-
-network.ipv6_prefix = 64
-network.ipv6_internet_port.type =
-network.ipv6_internet_port.ip =
-network.ipv6_internet_port.gateway =
-network.ipv6_primary_dns =
-network.ipv6_secondary_dns =
-network.ipv6_icmp_v6.enable =
-
-#Configure the WAN port type; 0-DHCP (default), 1-PPPoE, 2-Static IP Address;
-#Require reboot;
-network.internet_port.type =
-
-#Configure the static IP address, subnet mask, gateway and DNS server;
-#Require Reboot;
-network.internet_port.ip =
-network.internet_port.mask =
-network.internet_port.gateway =
-{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
-
-{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
-
 #######################################################################################
 ##                           Account 4 Basic Settings                                ##
 #######################################################################################
@@ -1998,33 +1937,6 @@ account.4.xsi.server_type =
 account.4.xsi.port =
 
 
-#######################################################################################
-##                                   NETWORK                                         ##
-#######################################################################################
-##0-ipv4, 1-ipv6, 2-ipv4&ipv6
-network.ip_address_mode = 2
-
-network.ipv6_prefix = 64
-network.ipv6_internet_port.type =
-network.ipv6_internet_port.ip =
-network.ipv6_internet_port.gateway =
-network.ipv6_primary_dns =
-network.ipv6_secondary_dns =
-network.ipv6_icmp_v6.enable =
-
-#Configure the WAN port type; 0-DHCP (default), 1-PPPoE, 2-Static IP Address;
-#Require reboot;
-network.internet_port.type =
-
-#Configure the static IP address, subnet mask, gateway and DNS server;
-#Require Reboot;
-network.internet_port.ip =
-network.internet_port.mask =
-network.internet_port.gateway =
-{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
-
-{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
-
 #######################################################################################
 ##                           Account 5 Basic Settings                                ##
 #######################################################################################
@@ -2497,33 +2409,6 @@ account.5.xsi.server_type =
 account.5.xsi.port =
 
 
-#######################################################################################
-##                                   NETWORK                                         ##
-#######################################################################################
-##0-ipv4, 1-ipv6, 2-ipv4&ipv6
-network.ip_address_mode = 2
-
-network.ipv6_prefix = 64
-network.ipv6_internet_port.type =
-network.ipv6_internet_port.ip =
-network.ipv6_internet_port.gateway =
-network.ipv6_primary_dns =
-network.ipv6_secondary_dns =
-network.ipv6_icmp_v6.enable =
-
-#Configure the WAN port type; 0-DHCP (default), 1-PPPoE, 2-Static IP Address;
-#Require reboot;
-network.internet_port.type =
-
-#Configure the static IP address, subnet mask, gateway and DNS server;
-#Require Reboot;
-network.internet_port.ip =
-network.internet_port.mask =
-network.internet_port.gateway =
-{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
-
-{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
-
 #######################################################################################
 ##                           Account 6 Basic Settings                                ##
 #######################################################################################
@@ -2995,35 +2880,6 @@ account.6.xsi.server_type =
 account.6.xsi.port =
 
 
-#######################################################################################
-##                                   NETWORK                                         ##
-#######################################################################################
-##0-ipv4, 1-ipv6, 2-ipv4&ipv6
-network.ip_address_mode = 2
-
-network.ipv6_prefix = 64
-network.ipv6_internet_port.type =
-network.ipv6_internet_port.ip =
-network.ipv6_internet_port.gateway =
-network.ipv6_primary_dns =
-network.ipv6_secondary_dns =
-network.ipv6_icmp_v6.enable =
-
-#Configure the WAN port type; 0-DHCP (default), 1-PPPoE, 2-Static IP Address;
-#Require reboot;
-network.internet_port.type =
-
-#Configure the static IP address, subnet mask, gateway and DNS server;
-#Require Reboot;
-network.internet_port.ip =
-network.internet_port.mask =
-network.internet_port.gateway =
-{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
-
-{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
-
-{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
-
 #######################################################################################
 ##                             Line Key                                              ##
 #######################################################################################
@@ -3104,16 +2960,6 @@ expansion_module.1.key.{$row.device_key_id}.xml_phonebook =
 ##                                  Expansion Module 2                                  ##
 ##########################################################################################
 
-#Expansion module 2 key 1
-#expansion_module.2.key.1.type =
-#expansion_module.2.key.1.line =
-#expansion_module.2.key.1.value =
-#expansion_module.2.key.1.extension =
-#expansion_module.2.key.1.label =
-#expansion_module.2.key.1.xml_phonebook =
-#expansion_module.2.key.1.type =
-#expansion_module.2.key.1.label =
-
 {foreach $keys["expansion-2"] as $row}
 expansion_module.2.key.{$row.device_key_id}.type = {$row.device_key_type}
 expansion_module.2.key.{$row.device_key_id}.line = {$row.device_key_line}
@@ -3123,3 +2969,64 @@ expansion_module.2.key.{$row.device_key_id}.label = {$row.device_key_label}
 expansion_module.2.key.{$row.device_key_id}.xml_phonebook =
 
 {/foreach}
+
+
+##########################################################################################
+##                                  Expansion Module 3                                  ##
+##########################################################################################
+
+{foreach $keys["expansion-3"] as $row}
+expansion_module.3.key.{$row.device_key_id}.type = {$row.device_key_type}
+expansion_module.3.key.{$row.device_key_id}.line = {$row.device_key_line}
+expansion_module.3.key.{$row.device_key_id}.value = {$row.device_key_value}
+expansion_module.3.key.{$row.device_key_id}.extension = {$row.device_key_extension}
+expansion_module.3.key.{$row.device_key_id}.label = {$row.device_key_label}
+expansion_module.3.key.{$row.device_key_id}.xml_phonebook =
+
+{/foreach}
+
+
+##########################################################################################
+##                                  Expansion Module 4                                  ##
+##########################################################################################
+
+{foreach $keys["expansion-4"] as $row}
+expansion_module.4.key.{$row.device_key_id}.type = {$row.device_key_type}
+expansion_module.4.key.{$row.device_key_id}.line = {$row.device_key_line}
+expansion_module.4.key.{$row.device_key_id}.value = {$row.device_key_value}
+expansion_module.4.key.{$row.device_key_id}.extension = {$row.device_key_extension}
+expansion_module.4.key.{$row.device_key_id}.label = {$row.device_key_label}
+expansion_module.4.key.{$row.device_key_id}.xml_phonebook =
+
+{/foreach}
+
+
+##########################################################################################
+##                                  Expansion Module 5                                  ##
+##########################################################################################
+
+{foreach $keys["expansion-5"] as $row}
+expansion_module.5.key.{$row.device_key_id}.type = {$row.device_key_type}
+expansion_module.5.key.{$row.device_key_id}.line = {$row.device_key_line}
+expansion_module.5.key.{$row.device_key_id}.value = {$row.device_key_value}
+expansion_module.5.key.{$row.device_key_id}.extension = {$row.device_key_extension}
+expansion_module.5.key.{$row.device_key_id}.label = {$row.device_key_label}
+expansion_module.5.key.{$row.device_key_id}.xml_phonebook =
+
+{/foreach}
+
+
+##########################################################################################
+##                                  Expansion Module 6                                  ##
+##########################################################################################
+
+{foreach $keys["expansion-6"] as $row}
+expansion_module.6.key.{$row.device_key_id}.type = {$row.device_key_type}
+expansion_module.6.key.{$row.device_key_id}.line = {$row.device_key_line}
+expansion_module.6.key.{$row.device_key_id}.value = {$row.device_key_value}
+expansion_module.6.key.{$row.device_key_id}.extension = {$row.device_key_extension}
+expansion_module.6.key.{$row.device_key_id}.label = {$row.device_key_label}
+expansion_module.6.key.{$row.device_key_id}.xml_phonebook =
+
+{/foreach}
+