From b74a2bf7ccb03339b4f1c550b933ac18241e327a Mon Sep 17 00:00:00 2001 From: markjcrane Date: Thu, 28 Dec 2017 13:44:12 -0700 Subject: [PATCH] Yealink templates additional work on consistency. --- .../provision/yealink/t23g/{$mac}.cfg | 144 ++------------- .../provision/yealink/t23p/{$mac}.cfg | 173 ++++-------------- .../provision/yealink/t27g/{$mac}.cfg | 144 ++------------- .../provision/yealink/t27p/{$mac}.cfg | 144 ++------------- .../provision/yealink/t29g/{$mac}.cfg | 164 +++-------------- .../provision/yealink/t42g/{$mac}.cfg | 30 ++- .../provision/yealink/t46g/{$mac}.cfg | 10 +- .../provision/yealink/t48g/{$mac}.cfg | 29 ++- 8 files changed, 174 insertions(+), 664 deletions(-) diff --git a/resources/templates/provision/yealink/t23g/{$mac}.cfg b/resources/templates/provision/yealink/t23g/{$mac}.cfg index 0a6cf02abd..3bb264f61c 100644 --- a/resources/templates/provision/yealink/t23g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t23g/{$mac}.cfg @@ -500,7 +500,10 @@ account.2.user_name = {$user_id_2} account.2.sip_server_host = {$server_address_2} account.2.sip_server_port = {$sip_port_2} account.2.outbound_host = {$outbound_proxy_2} -account.2.outbound_port = 5060 + +account.2.outbound_port = {$sip_port_2} +{if isset($yealink_sip_listen_port)}account.2.sip_listen_port = {$yealink_sip_listen_port}{else}account.2.sip_listen_port = 5060{/if} + account.2.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_2 == 'udp'}account.2.transport = 0{/if} @@ -960,36 +963,6 @@ 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 ## @@ -1009,7 +982,10 @@ account.3.user_name = {$user_id_3} account.3.sip_server_host = {$server_address_3} account.3.sip_server_port = {$sip_port_3} account.3.outbound_host = {$outbound_proxy_3} -account.3.outbound_port = 5060 + +account.3.outbound_port = {$sip_port_3} +{if isset($yealink_sip_listen_port)}account.3.sip_listen_port = {$yealink_sip_listen_port}{else}account.3.sip_listen_port = 5060{/if} + account.3.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_3 == 'udp'}account.3.transport = 0{/if} @@ -1459,28 +1435,6 @@ 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 ## @@ -1500,7 +1454,10 @@ account.4.user_name = {$user_id_4} account.4.sip_server_host = {$server_address_4} account.4.sip_server_port = {$sip_port_4} account.4.outbound_host = {$outbound_proxy_4} -account.4.outbound_port = 5060 + +account.4.outbound_port = {$sip_port_4} +{if isset($yealink_sip_listen_port)}account.4.sip_listen_port = {$yealink_sip_listen_port}{else}account.4.sip_listen_port = 5060{/if} + account.4.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_4 == 'udp'}account.4.transport = 0{/if} @@ -1950,28 +1907,6 @@ 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 ## @@ -1991,7 +1926,10 @@ account.5.user_name = {$user_id_5} account.5.sip_server_host = {$server_address_5} account.5.sip_server_port = {$sip_port_5} account.5.outbound_host = {$outbound_proxy_5} -account.5.outbound_port = 5060 + +account.5.outbound_port = {$sip_port_5} +{if isset($yealink_sip_listen_port)}account.5.sip_listen_port = {$yealink_sip_listen_port}{else}account.5.sip_listen_port = 5060{/if} + account.5.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_5 == 'udp'}account.5.transport = 0{/if} @@ -2441,28 +2379,6 @@ 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 ## @@ -2482,7 +2398,10 @@ account.6.user_name = {$user_id_6} account.6.sip_server_host = {$server_address_6} account.6.sip_server_port = {$sip_port_6} account.6.outbound_host = {$outbound_proxy_6} -account.6.outbound_port = 5060 + +account.6.outbound_port = {$sip_port_6} +{if isset($yealink_sip_listen_port)}account.6.sip_listen_port = {$yealink_sip_listen_port}{else}account.6.sip_listen_port = 5060{/if} + account.6.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_6 == 'udp'}account.6.transport = 0{/if} @@ -2931,29 +2850,6 @@ 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 ## diff --git a/resources/templates/provision/yealink/t23p/{$mac}.cfg b/resources/templates/provision/yealink/t23p/{$mac}.cfg index dd9e495048..674c34e86d 100644 --- a/resources/templates/provision/yealink/t23p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t23p/{$mac}.cfg @@ -20,8 +20,9 @@ account.1.user_name = {$user_id_1} account.1.sip_server_host = {$server_address_1} account.1.sip_server_port = {$sip_port_1} account.1.outbound_host = {$outbound_proxy_1} -account.1.outbound_port = 5060 -account.1.sip_listen_port = 5060 +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} {if $sip_transport_1 == 'tcp'}account.1.transport = 1{/if} @@ -228,12 +229,12 @@ account.1.bla_subscribe_period = 300 account.1.codec.1.enable = 1 account.1.codec.1.payload_type = PCMU -account.1.codec.1.priority = 1 +account.1.codec.1.priority = 2 account.1.codec.1.rtpmap = 0 account.1.codec.2.enable = 1 account.1.codec.2.payload_type = PCMA -account.1.codec.2.priority = 2 +account.1.codec.2.priority = 3 account.1.codec.2.rtpmap = 8 account.1.codec.3.enable = 0 @@ -253,7 +254,7 @@ account.1.codec.5.rtpmap = 18 account.1.codec.6.enable = 1 account.1.codec.6.payload_type = G722 -account.1.codec.6.priority = 4 +account.1.codec.6.priority = 1 account.1.codec.6.rtpmap = 9 account.1.codec.7.enable = 0 @@ -500,7 +501,10 @@ account.2.user_name = {$user_id_2} account.2.sip_server_host = {$server_address_2} account.2.sip_server_port = {$sip_port_2} account.2.outbound_host = {$outbound_proxy_2} -account.2.outbound_port = 5060 + +account.2.outbound_port = {$sip_port_2} +{if isset($yealink_sip_listen_port)}account.2.sip_listen_port = {$yealink_sip_listen_port}{else}account.2.sip_listen_port = 5060{/if} + account.2.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_2 == 'udp'}account.2.transport = 0{/if} @@ -693,12 +697,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 = 1 +account.2.codec.1.priority = 2 account.2.codec.1.rtpmap = 0 account.2.codec.2.enable = 1 account.2.codec.2.payload_type = PCMA -account.2.codec.2.priority = 2 +account.2.codec.2.priority = 3 account.2.codec.2.rtpmap = 8 account.2.codec.3.enable = 0 @@ -718,7 +722,7 @@ account.2.codec.5.rtpmap = 18 account.2.codec.6.enable = 1 account.2.codec.6.payload_type = G722 -account.2.codec.6.priority = 4 +account.2.codec.6.priority = 1 account.2.codec.6.rtpmap = 9 account.2.codec.7.enable = 0 @@ -960,36 +964,6 @@ 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 ## @@ -1009,7 +983,10 @@ account.3.user_name = {$user_id_3} account.3.sip_server_host = {$server_address_3} account.3.sip_server_port = {$sip_port_3} account.3.outbound_host = {$outbound_proxy_3} -account.3.outbound_port = 5060 + +account.3.outbound_port = {$sip_port_3} +{if isset($yealink_sip_listen_port)}account.3.sip_listen_port = {$yealink_sip_listen_port}{else}account.3.sip_listen_port = 5060{/if} + account.3.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_3 == 'udp'}account.3.transport = 0{/if} @@ -1202,12 +1179,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 = 1 +account.3.codec.1.priority = 2 account.3.codec.1.rtpmap = 0 account.3.codec.2.enable = 1 account.3.codec.2.payload_type = PCMA -account.3.codec.2.priority = 2 +account.3.codec.2.priority = 3 account.3.codec.2.rtpmap = 8 account.3.codec.3.enable = 0 @@ -1227,7 +1204,7 @@ account.3.codec.5.rtpmap = 18 account.3.codec.6.enable = 1 account.3.codec.6.payload_type = G722 -account.3.codec.6.priority = 4 +account.3.codec.6.priority = 1 account.3.codec.6.rtpmap = 9 account.3.codec.7.enable = 0 @@ -1459,28 +1436,6 @@ 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 ## @@ -1500,7 +1455,10 @@ account.4.user_name = {$user_id_4} account.4.sip_server_host = {$server_address_4} account.4.sip_server_port = {$sip_port_4} account.4.outbound_host = {$outbound_proxy_4} -account.4.outbound_port = 5060 + +account.4.outbound_port = {$sip_port_4} +{if isset($yealink_sip_listen_port)}account.4.sip_listen_port = {$yealink_sip_listen_port}{else}account.4.sip_listen_port = 5060{/if} + account.4.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_4 == 'udp'}account.4.transport = 0{/if} @@ -1950,28 +1908,6 @@ 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 ## @@ -1991,7 +1927,10 @@ account.5.user_name = {$user_id_5} account.5.sip_server_host = {$server_address_5} account.5.sip_server_port = {$sip_port_5} account.5.outbound_host = {$outbound_proxy_5} -account.5.outbound_port = 5060 + +account.5.outbound_port = {$sip_port_5} +{if isset($yealink_sip_listen_port)}account.5.sip_listen_port = {$yealink_sip_listen_port}{else}account.5.sip_listen_port = 5060{/if} + account.5.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_5 == 'udp'}account.5.transport = 0{/if} @@ -2441,28 +2380,6 @@ 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 ## @@ -2482,7 +2399,10 @@ account.6.user_name = {$user_id_6} account.6.sip_server_host = {$server_address_6} account.6.sip_server_port = {$sip_port_6} account.6.outbound_host = {$outbound_proxy_6} -account.6.outbound_port = 5060 + +account.6.outbound_port = {$sip_port_6} +{if isset($yealink_sip_listen_port)}account.6.sip_listen_port = {$yealink_sip_listen_port}{else}account.6.sip_listen_port = 5060{/if} + account.6.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_6 == 'udp'}account.6.transport = 0{/if} @@ -2931,29 +2851,6 @@ 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 ## @@ -2964,7 +2861,6 @@ network.internet_port.gateway = #linekey.x.lable--Define the label for each line key. Meet-Me Conference "1" or BLF "16" require pick_value. {foreach $keys['line'] as $row} - #Configure Line Key {$row.device_key_id} linekey.{$row.device_key_id}.line = {$row.device_key_line} linekey.{$row.device_key_id}.value = {$row.device_key_value} @@ -2977,7 +2873,6 @@ linekey.{$row.device_key_id}.type = {$row.device_key_type} linekey.{$row.device_key_id}.xml_phonebook = linekey.{$row.device_key_id}.label = {$row.device_key_label} - {/foreach} @@ -2999,7 +2894,6 @@ linekey.{$row.device_key_id}.label = {$row.device_key_label} #memorykey.x.sub_type = {foreach $keys["memory"] as $row} - #Expansion Memory Key {$row.device_key_id} memorykey.{$row.device_key_id}.type = {$row.device_key_type} memorykey.{$row.device_key_id}.line = {$row.device_key_line} @@ -3009,7 +2903,6 @@ memorykey.{$row.device_key_id}.label = {$row.device_key_label} memorykey.{$row.device_key_id}.xml_phonebook = memorykey.{$row.device_key_id}.sub_type = - {/foreach} @@ -3027,7 +2920,6 @@ memorykey.{$row.device_key_id}.sub_type = #But, when the programmable key is configured as Pick Up, the value 0 stands for line 1. {foreach $keys["programmable"] as $row} - programablekey.{$row.device_key_id}.type = {$row.device_key_type} programablekey.{$row.device_key_id}.line = {$row.device_key_line} programablekey.{$row.device_key_id}.value = {$row.device_key_value} @@ -3089,7 +2981,6 @@ programablekey.3.label = {$rownum = 1} {foreach $keys["expansion"] as $row} - {if $rownum <= 40} expansion_module.1.key.{$row.device_key_id}.type = {$row.device_key_type} expansion_module.1.key.{$row.device_key_id}.line = {$row.device_key_line} diff --git a/resources/templates/provision/yealink/t27g/{$mac}.cfg b/resources/templates/provision/yealink/t27g/{$mac}.cfg index c9ab1ca525..573f24256f 100644 --- a/resources/templates/provision/yealink/t27g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t27g/{$mac}.cfg @@ -501,7 +501,10 @@ account.2.user_name = {$user_id_2} account.2.sip_server_host = {$server_address_2} account.2.sip_server_port = {$sip_port_2} account.2.outbound_host = {$outbound_proxy_2} -account.2.outbound_port = 5060 + +account.2.outbound_port = {$sip_port_2} +{if isset($yealink_sip_listen_port)}account.2.sip_listen_port = {$yealink_sip_listen_port}{else}account.2.sip_listen_port = 5060{/if} + account.2.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_2 == 'udp'}account.2.transport = 0{/if} @@ -961,36 +964,6 @@ 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 ## @@ -1010,7 +983,10 @@ account.3.user_name = {$user_id_3} account.3.sip_server_host = {$server_address_3} account.3.sip_server_port = {$sip_port_3} account.3.outbound_host = {$outbound_proxy_3} -account.3.outbound_port = 5060 + +account.3.outbound_port = {$sip_port_3} +{if isset($yealink_sip_listen_port)}account.3.sip_listen_port = {$yealink_sip_listen_port}{else}account.3.sip_listen_port = 5060{/if} + account.3.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_3 == 'udp'}account.3.transport = 0{/if} @@ -1460,28 +1436,6 @@ 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 ## @@ -1501,7 +1455,10 @@ account.4.user_name = {$user_id_4} account.4.sip_server_host = {$server_address_4} account.4.sip_server_port = {$sip_port_4} account.4.outbound_host = {$outbound_proxy_4} -account.4.outbound_port = 5060 + +account.4.outbound_port = {$sip_port_4} +{if isset($yealink_sip_listen_port)}account.4.sip_listen_port = {$yealink_sip_listen_port}{else}account.4.sip_listen_port = 5060{/if} + account.4.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_4 == 'udp'}account.4.transport = 0{/if} @@ -1951,28 +1908,6 @@ 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 ## @@ -1992,7 +1927,10 @@ account.5.user_name = {$user_id_5} account.5.sip_server_host = {$server_address_5} account.5.sip_server_port = {$sip_port_5} account.5.outbound_host = {$outbound_proxy_5} -account.5.outbound_port = 5060 + +account.5.outbound_port = {$sip_port_5} +{if isset($yealink_sip_listen_port)}account.5.sip_listen_port = {$yealink_sip_listen_port}{else}account.5.sip_listen_port = 5060{/if} + account.5.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_5 == 'udp'}account.5.transport = 0{/if} @@ -2442,28 +2380,6 @@ 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 ## @@ -2483,7 +2399,10 @@ account.6.user_name = {$user_id_6} account.6.sip_server_host = {$server_address_6} account.6.sip_server_port = {$sip_port_6} account.6.outbound_host = {$outbound_proxy_6} -account.6.outbound_port = 5060 + +account.6.outbound_port = {$sip_port_6} +{if isset($yealink_sip_listen_port)}account.6.sip_listen_port = {$yealink_sip_listen_port}{else}account.6.sip_listen_port = 5060{/if} + account.6.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_6 == 'udp'}account.6.transport = 0{/if} @@ -2932,29 +2851,6 @@ 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 ## diff --git a/resources/templates/provision/yealink/t27p/{$mac}.cfg b/resources/templates/provision/yealink/t27p/{$mac}.cfg index f0bb9adb5c..674c34e86d 100644 --- a/resources/templates/provision/yealink/t27p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t27p/{$mac}.cfg @@ -501,7 +501,10 @@ account.2.user_name = {$user_id_2} account.2.sip_server_host = {$server_address_2} account.2.sip_server_port = {$sip_port_2} account.2.outbound_host = {$outbound_proxy_2} -account.2.outbound_port = 5060 + +account.2.outbound_port = {$sip_port_2} +{if isset($yealink_sip_listen_port)}account.2.sip_listen_port = {$yealink_sip_listen_port}{else}account.2.sip_listen_port = 5060{/if} + account.2.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_2 == 'udp'}account.2.transport = 0{/if} @@ -961,36 +964,6 @@ 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 ## @@ -1010,7 +983,10 @@ account.3.user_name = {$user_id_3} account.3.sip_server_host = {$server_address_3} account.3.sip_server_port = {$sip_port_3} account.3.outbound_host = {$outbound_proxy_3} -account.3.outbound_port = 5060 + +account.3.outbound_port = {$sip_port_3} +{if isset($yealink_sip_listen_port)}account.3.sip_listen_port = {$yealink_sip_listen_port}{else}account.3.sip_listen_port = 5060{/if} + account.3.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_3 == 'udp'}account.3.transport = 0{/if} @@ -1460,28 +1436,6 @@ 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 ## @@ -1501,7 +1455,10 @@ account.4.user_name = {$user_id_4} account.4.sip_server_host = {$server_address_4} account.4.sip_server_port = {$sip_port_4} account.4.outbound_host = {$outbound_proxy_4} -account.4.outbound_port = 5060 + +account.4.outbound_port = {$sip_port_4} +{if isset($yealink_sip_listen_port)}account.4.sip_listen_port = {$yealink_sip_listen_port}{else}account.4.sip_listen_port = 5060{/if} + account.4.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_4 == 'udp'}account.4.transport = 0{/if} @@ -1951,28 +1908,6 @@ 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 ## @@ -1992,7 +1927,10 @@ account.5.user_name = {$user_id_5} account.5.sip_server_host = {$server_address_5} account.5.sip_server_port = {$sip_port_5} account.5.outbound_host = {$outbound_proxy_5} -account.5.outbound_port = 5060 + +account.5.outbound_port = {$sip_port_5} +{if isset($yealink_sip_listen_port)}account.5.sip_listen_port = {$yealink_sip_listen_port}{else}account.5.sip_listen_port = 5060{/if} + account.5.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_5 == 'udp'}account.5.transport = 0{/if} @@ -2442,28 +2380,6 @@ 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 ## @@ -2483,7 +2399,10 @@ account.6.user_name = {$user_id_6} account.6.sip_server_host = {$server_address_6} account.6.sip_server_port = {$sip_port_6} account.6.outbound_host = {$outbound_proxy_6} -account.6.outbound_port = 5060 + +account.6.outbound_port = {$sip_port_6} +{if isset($yealink_sip_listen_port)}account.6.sip_listen_port = {$yealink_sip_listen_port}{else}account.6.sip_listen_port = 5060{/if} + account.6.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_6 == 'udp'}account.6.transport = 0{/if} @@ -2932,29 +2851,6 @@ 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 ## diff --git a/resources/templates/provision/yealink/t29g/{$mac}.cfg b/resources/templates/provision/yealink/t29g/{$mac}.cfg index f5a2b0b10d..674c34e86d 100644 --- a/resources/templates/provision/yealink/t29g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t29g/{$mac}.cfg @@ -204,7 +204,11 @@ account.1.out_dialog_blf_enable = 0 ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; -account.1.shared_line = +{if isset($shared_line_1) } +account.1.shared_line = {$shared_line_1} +{else} +account.1.shared_line = 0 +{/if} #Configure BLA number for account1 and the subscribe period (in seconds). It ranges from 60 to 7200, the default value is 300. account.1.bla_number = @@ -497,7 +501,10 @@ account.2.user_name = {$user_id_2} account.2.sip_server_host = {$server_address_2} account.2.sip_server_port = {$sip_port_2} account.2.outbound_host = {$outbound_proxy_2} -account.2.outbound_port = 5060 + +account.2.outbound_port = {$sip_port_2} +{if isset($yealink_sip_listen_port)}account.2.sip_listen_port = {$yealink_sip_listen_port}{else}account.2.sip_listen_port = 5060{/if} + account.2.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_2 == 'udp'}account.2.transport = 0{/if} @@ -957,36 +964,6 @@ 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 ## @@ -1006,7 +983,10 @@ account.3.user_name = {$user_id_3} account.3.sip_server_host = {$server_address_3} account.3.sip_server_port = {$sip_port_3} account.3.outbound_host = {$outbound_proxy_3} -account.3.outbound_port = 5060 + +account.3.outbound_port = {$sip_port_3} +{if isset($yealink_sip_listen_port)}account.3.sip_listen_port = {$yealink_sip_listen_port}{else}account.3.sip_listen_port = 5060{/if} + account.3.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_3 == 'udp'}account.3.transport = 0{/if} @@ -1456,28 +1436,6 @@ 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 ## @@ -1497,7 +1455,10 @@ account.4.user_name = {$user_id_4} account.4.sip_server_host = {$server_address_4} account.4.sip_server_port = {$sip_port_4} account.4.outbound_host = {$outbound_proxy_4} -account.4.outbound_port = 5060 + +account.4.outbound_port = {$sip_port_4} +{if isset($yealink_sip_listen_port)}account.4.sip_listen_port = {$yealink_sip_listen_port}{else}account.4.sip_listen_port = 5060{/if} + account.4.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_4 == 'udp'}account.4.transport = 0{/if} @@ -1947,28 +1908,6 @@ 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 ## @@ -1988,7 +1927,10 @@ account.5.user_name = {$user_id_5} account.5.sip_server_host = {$server_address_5} account.5.sip_server_port = {$sip_port_5} account.5.outbound_host = {$outbound_proxy_5} -account.5.outbound_port = 5060 + +account.5.outbound_port = {$sip_port_5} +{if isset($yealink_sip_listen_port)}account.5.sip_listen_port = {$yealink_sip_listen_port}{else}account.5.sip_listen_port = 5060{/if} + account.5.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_5 == 'udp'}account.5.transport = 0{/if} @@ -2438,36 +2380,6 @@ 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} -{if isset($dns_server_primary)} -network.static_dns_enable = 1 -{else}network.static_dns_enable = 0 -{/if} ####################################################################################### ## Account 6 Basic Settings ## @@ -2487,7 +2399,10 @@ account.6.user_name = {$user_id_6} account.6.sip_server_host = {$server_address_6} account.6.sip_server_port = {$sip_port_6} account.6.outbound_host = {$outbound_proxy_6} -account.6.outbound_port = 5060 + +account.6.outbound_port = {$sip_port_6} +{if isset($yealink_sip_listen_port)}account.6.sip_listen_port = {$yealink_sip_listen_port}{else}account.6.sip_listen_port = 5060{/if} + account.6.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_6 == 'udp'}account.6.transport = 0{/if} @@ -2936,29 +2851,6 @@ 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 ## @@ -3059,9 +2951,9 @@ programablekey.{$row.device_key_id}.label = {$row.device_key_label} #programablekey.2.history_type = #programablekey.2.label = -#N/A - Disable DND -programablekey.3.type = 0 -programablekey.3.line = +#DND +programablekey.3.type = 5 +programablekey.3.line = 1 programablekey.3.value = programablekey.3.xml_phonebook = programablekey.3.history_type = diff --git a/resources/templates/provision/yealink/t42g/{$mac}.cfg b/resources/templates/provision/yealink/t42g/{$mac}.cfg index 8b58720382..674c34e86d 100644 --- a/resources/templates/provision/yealink/t42g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t42g/{$mac}.cfg @@ -501,7 +501,10 @@ account.2.user_name = {$user_id_2} account.2.sip_server_host = {$server_address_2} account.2.sip_server_port = {$sip_port_2} account.2.outbound_host = {$outbound_proxy_2} -account.2.outbound_port = 5060 + +account.2.outbound_port = {$sip_port_2} +{if isset($yealink_sip_listen_port)}account.2.sip_listen_port = {$yealink_sip_listen_port}{else}account.2.sip_listen_port = 5060{/if} + account.2.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_2 == 'udp'}account.2.transport = 0{/if} @@ -957,6 +960,7 @@ account.2.xsi.port = local_time.time_zone = {$yealink_time_zone} local_time.time_zone_name = {$yealink_time_zone_name} + ####################################################################################### ## NETWORK ## ####################################################################################### @@ -979,7 +983,10 @@ account.3.user_name = {$user_id_3} account.3.sip_server_host = {$server_address_3} account.3.sip_server_port = {$sip_port_3} account.3.outbound_host = {$outbound_proxy_3} -account.3.outbound_port = 5060 + +account.3.outbound_port = {$sip_port_3} +{if isset($yealink_sip_listen_port)}account.3.sip_listen_port = {$yealink_sip_listen_port}{else}account.3.sip_listen_port = 5060{/if} + account.3.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_3 == 'udp'}account.3.transport = 0{/if} @@ -1425,6 +1432,7 @@ account.3.xsi.host = account.3.xsi.server_type = account.3.xsi.port = + ####################################################################################### ## NETWORK ## ####################################################################################### @@ -1447,7 +1455,10 @@ account.4.user_name = {$user_id_4} account.4.sip_server_host = {$server_address_4} account.4.sip_server_port = {$sip_port_4} account.4.outbound_host = {$outbound_proxy_4} -account.4.outbound_port = 5060 + +account.4.outbound_port = {$sip_port_4} +{if isset($yealink_sip_listen_port)}account.4.sip_listen_port = {$yealink_sip_listen_port}{else}account.4.sip_listen_port = 5060{/if} + account.4.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_4 == 'udp'}account.4.transport = 0{/if} @@ -1893,6 +1904,7 @@ account.4.xsi.host = account.4.xsi.server_type = account.4.xsi.port = + ####################################################################################### ## NETWORK ## ####################################################################################### @@ -1915,7 +1927,10 @@ account.5.user_name = {$user_id_5} account.5.sip_server_host = {$server_address_5} account.5.sip_server_port = {$sip_port_5} account.5.outbound_host = {$outbound_proxy_5} -account.5.outbound_port = 5060 + +account.5.outbound_port = {$sip_port_5} +{if isset($yealink_sip_listen_port)}account.5.sip_listen_port = {$yealink_sip_listen_port}{else}account.5.sip_listen_port = 5060{/if} + account.5.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_5 == 'udp'}account.5.transport = 0{/if} @@ -2361,6 +2376,7 @@ account.5.xsi.host = account.5.xsi.server_type = account.5.xsi.port = + ####################################################################################### ## NETWORK ## ####################################################################################### @@ -2383,7 +2399,10 @@ account.6.user_name = {$user_id_6} account.6.sip_server_host = {$server_address_6} account.6.sip_server_port = {$sip_port_6} account.6.outbound_host = {$outbound_proxy_6} -account.6.outbound_port = 5060 + +account.6.outbound_port = {$sip_port_6} +{if isset($yealink_sip_listen_port)}account.6.sip_listen_port = {$yealink_sip_listen_port}{else}account.6.sip_listen_port = 5060{/if} + account.6.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_6 == 'udp'}account.6.transport = 0{/if} @@ -2828,6 +2847,7 @@ account.6.xsi.host = account.6.xsi.server_type = account.6.xsi.port = + ####################################################################################### ## NETWORK ## ####################################################################################### diff --git a/resources/templates/provision/yealink/t46g/{$mac}.cfg b/resources/templates/provision/yealink/t46g/{$mac}.cfg index a586dd1b75..674c34e86d 100755 --- a/resources/templates/provision/yealink/t46g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t46g/{$mac}.cfg @@ -502,7 +502,7 @@ account.2.sip_server_host = {$server_address_2} account.2.sip_server_port = {$sip_port_2} account.2.outbound_host = {$outbound_proxy_2} -account.2.outbound_port = {$sip_port_1} +account.2.outbound_port = {$sip_port_2} {if isset($yealink_sip_listen_port)}account.2.sip_listen_port = {$yealink_sip_listen_port}{else}account.2.sip_listen_port = 5060{/if} account.2.sip_listen_port = 5060 @@ -984,7 +984,7 @@ account.3.sip_server_host = {$server_address_3} account.3.sip_server_port = {$sip_port_3} account.3.outbound_host = {$outbound_proxy_3} -account.3.outbound_port = {$sip_port_1} +account.3.outbound_port = {$sip_port_3} {if isset($yealink_sip_listen_port)}account.3.sip_listen_port = {$yealink_sip_listen_port}{else}account.3.sip_listen_port = 5060{/if} account.3.sip_listen_port = 5060 @@ -1456,7 +1456,7 @@ account.4.sip_server_host = {$server_address_4} account.4.sip_server_port = {$sip_port_4} account.4.outbound_host = {$outbound_proxy_4} -account.4.outbound_port = {$sip_port_1} +account.4.outbound_port = {$sip_port_4} {if isset($yealink_sip_listen_port)}account.4.sip_listen_port = {$yealink_sip_listen_port}{else}account.4.sip_listen_port = 5060{/if} account.4.sip_listen_port = 5060 @@ -1928,7 +1928,7 @@ account.5.sip_server_host = {$server_address_5} account.5.sip_server_port = {$sip_port_5} account.5.outbound_host = {$outbound_proxy_5} -account.5.outbound_port = {$sip_port_1} +account.5.outbound_port = {$sip_port_5} {if isset($yealink_sip_listen_port)}account.5.sip_listen_port = {$yealink_sip_listen_port}{else}account.5.sip_listen_port = 5060{/if} account.5.sip_listen_port = 5060 @@ -2400,7 +2400,7 @@ account.6.sip_server_host = {$server_address_6} account.6.sip_server_port = {$sip_port_6} account.6.outbound_host = {$outbound_proxy_6} -account.6.outbound_port = {$sip_port_1} +account.6.outbound_port = {$sip_port_6} {if isset($yealink_sip_listen_port)}account.6.sip_listen_port = {$yealink_sip_listen_port}{else}account.6.sip_listen_port = 5060{/if} account.6.sip_listen_port = 5060 diff --git a/resources/templates/provision/yealink/t48g/{$mac}.cfg b/resources/templates/provision/yealink/t48g/{$mac}.cfg index b06d3b16f7..674c34e86d 100644 --- a/resources/templates/provision/yealink/t48g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t48g/{$mac}.cfg @@ -501,7 +501,10 @@ account.2.user_name = {$user_id_2} account.2.sip_server_host = {$server_address_2} account.2.sip_server_port = {$sip_port_2} account.2.outbound_host = {$outbound_proxy_2} -account.2.outbound_port = 5060 + +account.2.outbound_port = {$sip_port_2} +{if isset($yealink_sip_listen_port)}account.2.sip_listen_port = {$yealink_sip_listen_port}{else}account.2.sip_listen_port = 5060{/if} + account.2.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_2 == 'udp'}account.2.transport = 0{/if} @@ -980,7 +983,10 @@ account.3.user_name = {$user_id_3} account.3.sip_server_host = {$server_address_3} account.3.sip_server_port = {$sip_port_3} account.3.outbound_host = {$outbound_proxy_3} -account.3.outbound_port = 5060 + +account.3.outbound_port = {$sip_port_3} +{if isset($yealink_sip_listen_port)}account.3.sip_listen_port = {$yealink_sip_listen_port}{else}account.3.sip_listen_port = 5060{/if} + account.3.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_3 == 'udp'}account.3.transport = 0{/if} @@ -1426,6 +1432,7 @@ account.3.xsi.host = account.3.xsi.server_type = account.3.xsi.port = + ####################################################################################### ## NETWORK ## ####################################################################################### @@ -1448,7 +1455,10 @@ account.4.user_name = {$user_id_4} account.4.sip_server_host = {$server_address_4} account.4.sip_server_port = {$sip_port_4} account.4.outbound_host = {$outbound_proxy_4} -account.4.outbound_port = 5060 + +account.4.outbound_port = {$sip_port_4} +{if isset($yealink_sip_listen_port)}account.4.sip_listen_port = {$yealink_sip_listen_port}{else}account.4.sip_listen_port = 5060{/if} + account.4.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_4 == 'udp'}account.4.transport = 0{/if} @@ -1894,6 +1904,7 @@ account.4.xsi.host = account.4.xsi.server_type = account.4.xsi.port = + ####################################################################################### ## NETWORK ## ####################################################################################### @@ -1916,7 +1927,10 @@ account.5.user_name = {$user_id_5} account.5.sip_server_host = {$server_address_5} account.5.sip_server_port = {$sip_port_5} account.5.outbound_host = {$outbound_proxy_5} -account.5.outbound_port = 5060 + +account.5.outbound_port = {$sip_port_5} +{if isset($yealink_sip_listen_port)}account.5.sip_listen_port = {$yealink_sip_listen_port}{else}account.5.sip_listen_port = 5060{/if} + account.5.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_5 == 'udp'}account.5.transport = 0{/if} @@ -2362,6 +2376,7 @@ account.5.xsi.host = account.5.xsi.server_type = account.5.xsi.port = + ####################################################################################### ## NETWORK ## ####################################################################################### @@ -2384,7 +2399,10 @@ account.6.user_name = {$user_id_6} account.6.sip_server_host = {$server_address_6} account.6.sip_server_port = {$sip_port_6} account.6.outbound_host = {$outbound_proxy_6} -account.6.outbound_port = 5060 + +account.6.outbound_port = {$sip_port_6} +{if isset($yealink_sip_listen_port)}account.6.sip_listen_port = {$yealink_sip_listen_port}{else}account.6.sip_listen_port = 5060{/if} + account.6.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $sip_transport_6 == 'udp'}account.6.transport = 0{/if} @@ -2829,6 +2847,7 @@ account.6.xsi.host = account.6.xsi.server_type = account.6.xsi.port = + ####################################################################################### ## NETWORK ## #######################################################################################