From 2d4e4fdac669b766d55a810ec6f3ee4a442c6a66 Mon Sep 17 00:00:00 2001 From: markjcrane Date: Tue, 23 Aug 2016 14:12:55 -0600 Subject: [PATCH] Update outbound proxy support in the Yealink templates. --- .../provision/yealink/t23g/{$mac}.cfg | 192 ++++++++++++------ .../provision/yealink/t27p/{$mac}.cfg | 155 +++++++++----- .../provision/yealink/t29g/{$mac}.cfg | 156 +++++++++----- .../provision/yealink/t41p/{$mac}.cfg | 156 +++++++++----- .../provision/yealink/t42g/{$mac}.cfg | 155 +++++++++----- .../provision/yealink/t46g/{$mac}.cfg | 127 ++++++------ .../provision/yealink/t48g/{$mac}.cfg | 96 ++++++--- .../provision/yealink/t49g/{$mac}.cfg | 97 ++++++--- 8 files changed, 748 insertions(+), 386 deletions(-) diff --git a/resources/templates/provision/yealink/t23g/{$mac}.cfg b/resources/templates/provision/yealink/t23g/{$mac}.cfg index cd544903ee..c516e2ceea 100644 --- a/resources/templates/provision/yealink/t23g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t23g/{$mac}.cfg @@ -5,7 +5,7 @@ ####################################################################################### ## Account 1 Basic Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_1) } account.1.enable = 1 @@ -19,7 +19,6 @@ account.1.password = {$user_password_1} 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_proxy_enable = account.1.outbound_host = {$outbound_proxy_1} account.1.outbound_port = 5060 account.1.sip_listen_port = 5060 @@ -29,11 +28,25 @@ account.1.sip_listen_port = 5060 {if $sip_transport_1 == 'tls'}account.1.transport = 2{/if} {if $sip_transport_1 == 'dns srv'}account.1.transport = 3{/if} +account.1.outbound_proxy.1.address = {$outbound_proxy_primary_1} +account.1.outbound_proxy.2.address = {$outbound_proxy_secondary_1} +account.1.outbound_proxy_enable = {if isset($outbound_proxy_primary_1)}1{else}0{/if} + +{if isset($outbound_proxy_1_port)} +account.1.outbound_proxy.1.port = {$outbound_proxy_1_port} +{else} +account.1.outbound_proxy.1.port = 5060 +{/if} +{if isset($outbound_proxy_1_port)} +account.1.outbound_proxy.2.port = {$outbound_proxy_2_port} +{else} +account.1.outbound_proxy.2.port = 5060 +{/if} ####################################################################################### ## Failback ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.1.reregister_enable = 0 @@ -87,7 +100,7 @@ account.1.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -139,7 +152,7 @@ account.1.nat.rport = {$yealink_rport_1} ####################################################################################### ## AccountX Advance Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -154,7 +167,7 @@ voice_mail.number.1 = {$voicemail_number} ####################################################################################### ## Subscribe ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.1.subscribe_mwi = 1 @@ -169,7 +182,7 @@ account.1.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -186,7 +199,7 @@ account.1.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -466,7 +479,7 @@ account.1.xsi.port = ####################################################################################### ## Account 2 Basic Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_2) } account.2.enable = 1 @@ -480,7 +493,6 @@ account.2.password = {$user_password_2} 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_proxy_enable = account.2.outbound_host = {$outbound_proxy_2} account.2.outbound_port = 5060 account.2.sip_listen_port = 5060 @@ -490,11 +502,14 @@ account.2.sip_listen_port = 5060 {if $sip_transport_2 == 'tls'}account.2.transport = 2{/if} {if $sip_transport_2 == 'dns srv'}account.2.transport = 3{/if} +account.2.outbound_proxy.1.address = {$outbound_proxy_primary_2} +account.2.outbound_proxy.2.address = {$outbound_proxy_secondary_2} +account.2.outbound_proxy_enable = {if isset($outbound_proxy_primary_2)}1{else}0{/if} ####################################################################################### ## Failback ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.2.reregister_enable = 0 @@ -544,7 +559,7 @@ account.2.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -596,7 +611,7 @@ account.2.nat.rport = {$yealink_rport_2} ####################################################################################### ## Account2 Advance Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -611,7 +626,7 @@ voice_mail.number.2 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.2.subscribe_mwi = 1 @@ -626,7 +641,7 @@ account.2.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -643,7 +658,7 @@ account.2.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -960,7 +975,7 @@ network.internet_port.gateway = ####################################################################################### ## Account 3 Basic Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_3) } account.3.enable = 1 @@ -974,7 +989,6 @@ account.3.password = {$user_password_3} 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_proxy_enable = account.3.outbound_host = {$outbound_proxy_3} account.3.outbound_port = 5060 account.3.sip_listen_port = 5060 @@ -984,10 +998,14 @@ account.3.sip_listen_port = 5060 {if $sip_transport_3 == 'tls'}account.3.transport = 2{/if} {if $sip_transport_3 == 'dns srv'}account.3.transport = 3{/if} +account.3.outbound_proxy.1.address = {$outbound_proxy_primary_3} +account.3.outbound_proxy.2.address = {$outbound_proxy_secondary_3} +account.3.outbound_proxy_enable = {if isset($outbound_proxy_primary_3)}1{else}0{/if} + ####################################################################################### ## Failback ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.3.reregister_enable = 0 @@ -1037,7 +1055,7 @@ account.3.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -1089,7 +1107,7 @@ account.3.nat.rport = {$yealink_rport_3} ####################################################################################### ## Account3 Advance Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -1104,7 +1122,7 @@ voice_mail.number.3 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.3.subscribe_mwi = 1 @@ -1119,7 +1137,7 @@ account.3.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -1136,7 +1154,7 @@ account.3.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -1439,11 +1457,10 @@ 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 ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_4) } account.4.enable = 1 @@ -1457,7 +1474,6 @@ account.4.password = {$user_password_4} 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_proxy_enable = account.4.outbound_host = {$outbound_proxy_4} account.4.outbound_port = 5060 account.4.sip_listen_port = 5060 @@ -1467,10 +1483,14 @@ account.4.sip_listen_port = 5060 {if $sip_transport_4 == 'tls'}account.4.transport = 2{/if} {if $sip_transport_4 == 'dns srv'}account.4.transport = 3{/if} +account.4.outbound_proxy.1.address = {$outbound_proxy_primary_4} +account.4.outbound_proxy.2.address = {$outbound_proxy_secondary_4} +account.4.outbound_proxy_enable = {if isset($outbound_proxy_primary_4)}1{else}0{/if} + ####################################################################################### ## Failback ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.4.reregister_enable = 0 @@ -1520,7 +1540,7 @@ account.4.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -1572,7 +1592,7 @@ account.4.nat.rport = {$yealink_rport_4} ####################################################################################### ## Account4 Advance Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -1587,7 +1607,7 @@ voice_mail.number.4 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.4.subscribe_mwi = 1 @@ -1602,7 +1622,7 @@ account.4.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -1619,7 +1639,7 @@ account.4.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -1925,7 +1945,7 @@ network.internet_port.gateway = ####################################################################################### ## Account 5 Basic Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_5) } account.5.enable = 1 @@ -1939,7 +1959,6 @@ account.5.password = {$user_password_5} 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_proxy_enable = account.5.outbound_host = {$outbound_proxy_5} account.5.outbound_port = 5060 account.5.sip_listen_port = 5060 @@ -1949,10 +1968,14 @@ account.5.sip_listen_port = 5060 {if $sip_transport_5 == 'tls'}account.5.transport = 2{/if} {if $sip_transport_5 == 'dns srv'}account.5.transport = 3{/if} +account.5.outbound_proxy.1.address = {$outbound_proxy_primary_5} +account.5.outbound_proxy.2.address = {$outbound_proxy_secondary_5} +account.5.outbound_proxy_enable = {if isset($outbound_proxy_primary_5)}1{else}0{/if} + ####################################################################################### ## Failback ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.5.reregister_enable = 0 @@ -2002,7 +2025,7 @@ account.5.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -2054,7 +2077,7 @@ account.5.nat.rport = {$yealink_rport_5} ####################################################################################### ## Account5 Advance Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -2069,7 +2092,7 @@ voice_mail.number.5 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.5.subscribe_mwi = 1 @@ -2084,7 +2107,7 @@ account.5.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -2101,7 +2124,7 @@ account.5.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -2407,7 +2430,7 @@ network.internet_port.gateway = ####################################################################################### ## Account 6 Basic Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_6) } account.6.enable = 1 @@ -2421,7 +2444,6 @@ account.6.password = {$user_password_6} 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_proxy_enable = account.6.outbound_host = {$outbound_proxy_6} account.6.outbound_port = 5060 account.6.sip_listen_port = 5060 @@ -2431,10 +2453,14 @@ account.6.sip_listen_port = 5060 {if $sip_transport_6 == 'tls'}account.6.transport = 2{/if} {if $sip_transport_6 == 'dns srv'}account.6.transport = 3{/if} +account.6.outbound_proxy.1.address = {$outbound_proxy_primary_6} +account.6.outbound_proxy.2.address = {$outbound_proxy_secondary_6} +account.6.outbound_proxy_enable = {if isset($outbound_proxy_primary_6)}1{else}0{/if} + ####################################################################################### ## Failback ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.6.reregister_enable = 0 @@ -2484,7 +2510,7 @@ account.6.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -2513,7 +2539,7 @@ account.6.reg_fail_retry_interval = ######################################################################### ## NAT Settings ## ######################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.nat.nat_traversal = 0 #Enable or disable the NAT traversal; 0-Disabled (default), 1-STUN; @@ -2535,7 +2561,7 @@ account.6.nat.rport = {$yealink_rport_6} ####################################################################################### ## Account6 Advance Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -2550,14 +2576,14 @@ voice_mail.number.6 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = -account.6.subscribe_mwi = 1 +account.6.subscribe_mwi = 0 account.6.subscribe_mwi_expires = 3600 #Enable or disable the phone to subscribe to the voicemail through the message waiting indicator; 0-Disabled (default), 1-Enabled; -account.6.subscribe_mwi_to_vm = 1 +account.6.subscribe_mwi_to_vm = 0 account.6.subscribe_acd_expires= 3600 @@ -2565,7 +2591,7 @@ account.6.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -2582,7 +2608,7 @@ account.6.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -2957,18 +2983,54 @@ memorykey.{$row.device_key_id}.sub_type = #The value 0 of the "proramablekey.x.line" stands for Auto, it means the first available line. #But, when the programmable key is configured as Pick Up, the value 0 stands for line 1. +{foreach $keys as $row} + {if $row.device_key_category == "programmable"} + 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} + programablekey.{$row.device_key_id}.xml_phonebook = + programablekey.{$row.device_key_id}.history_type = + programablekey.{$row.device_key_id}.label = {$row.device_key_label} + {/if} +{/foreach} + #programablekey.x.value = #programablekey.x.xml_phonebook--Specify the desired remote phonebook/local group/BSFT phonebook for the programmable key. This parameter is only appilicable to the feature XML Group/Local Group/Broadsoft Group. #programablekey.x.history_type = #programablekey.x.label--This parameter is only available to the key 1 to key 4. -programablekey.1.type = -programablekey.1.line = -programablekey.1.value = -programablekey.1.xml_phonebook = -programablekey.1.history_type = -programablekey.1.label = +#History +#programablekey.1.type = 28 +#programablekey.1.line = 1 +#programablekey.1.value = +#programablekey.1.xml_phonebook = +#programablekey.1.history_type = +#programablekey.1.label = + +#Directory +#programablekey.2.type = 29 +#programablekey.2.line = 1 +#programablekey.2.value = +#programablekey.2.xml_phonebook = +#programablekey.2.history_type = +#programablekey.2.label = + +#N/A - Disable DND +programablekey.3.type = 0 +programablekey.3.line = +programablekey.3.value = +programablekey.3.xml_phonebook = +programablekey.3.history_type = +programablekey.3.label = + +#Menu +#programablekey.4.type = 30 +#programablekey.4.line = +#programablekey.4.value = +#programablekey.4.xml_phonebook = +#programablekey.4.history_type = +#programablekey.4.label = ########################################################################################## @@ -2982,16 +3044,26 @@ programablekey.1.label = #expansion_module.x.key.y.label = #expansion_module.X.key.Y.xml_phonebook = +{$rownum = 1} + {foreach $keys as $row} {if $row.device_key_category == "expansion"} -#Expansion module 1 key {$row.device_key_id} +{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} expansion_module.1.key.{$row.device_key_id}.value = {$row.device_key_value} expansion_module.1.key.{$row.device_key_id}.extension = {$row.device_key_extension} expansion_module.1.key.{$row.device_key_id}.label = {$row.device_key_label} expansion_module.1.key.{$row.device_key_id}.xml_phonebook = - +{else} +expansion_module.2.key.{$row.device_key_id - 40}.type = {$row.device_key_type} +expansion_module.2.key.{$row.device_key_id - 40}.line = {$row.device_key_line} +expansion_module.2.key.{$row.device_key_id - 40}.value = {$row.device_key_value} +expansion_module.2.key.{$row.device_key_id - 40}.extension = {$row.device_key_extension} +expansion_module.2.key.{$row.device_key_id - 40}.label = {$row.device_key_label} +expansion_module.2.key.{$row.device_key_id - 40}.xml_phonebook = +{/if} +{$rownum = $rownum + 1} {/if} {/foreach} diff --git a/resources/templates/provision/yealink/t27p/{$mac}.cfg b/resources/templates/provision/yealink/t27p/{$mac}.cfg index c4b9163c17..2b5252843c 100644 --- a/resources/templates/provision/yealink/t27p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t27p/{$mac}.cfg @@ -5,7 +5,7 @@ ####################################################################################### ## Account 1 Basic Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_1) } account.1.enable = 1 @@ -19,7 +19,6 @@ account.1.password = {$user_password_1} 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_proxy_enable = account.1.outbound_host = {$outbound_proxy_1} account.1.outbound_port = 5060 account.1.sip_listen_port = 5060 @@ -29,11 +28,25 @@ account.1.sip_listen_port = 5060 {if $sip_transport_1 == 'tls'}account.1.transport = 2{/if} {if $sip_transport_1 == 'dns srv'}account.1.transport = 3{/if} +account.1.outbound_proxy.1.address = {$outbound_proxy_primary_1} +account.1.outbound_proxy.2.address = {$outbound_proxy_secondary_1} +account.1.outbound_proxy_enable = {if isset($outbound_proxy_primary_1)}1{else}0{/if} + +{if isset($outbound_proxy_1_port)} +account.1.outbound_proxy.1.port = {$outbound_proxy_1_port} +{else} +account.1.outbound_proxy.1.port = 5060 +{/if} +{if isset($outbound_proxy_1_port)} +account.1.outbound_proxy.2.port = {$outbound_proxy_2_port} +{else} +account.1.outbound_proxy.2.port = 5060 +{/if} ####################################################################################### ## Failback ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.1.reregister_enable = 0 @@ -87,7 +100,7 @@ account.1.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -139,7 +152,7 @@ account.1.nat.rport = {$yealink_rport_1} ####################################################################################### ## AccountX Advance Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -154,7 +167,7 @@ voice_mail.number.1 = {$voicemail_number} ####################################################################################### ## Subscribe ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.1.subscribe_mwi = 1 @@ -169,7 +182,7 @@ account.1.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -186,7 +199,7 @@ account.1.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -466,7 +479,7 @@ account.1.xsi.port = ####################################################################################### ## Account 2 Basic Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_2) } account.2.enable = 1 @@ -480,7 +493,6 @@ account.2.password = {$user_password_2} 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_proxy_enable = account.2.outbound_host = {$outbound_proxy_2} account.2.outbound_port = 5060 account.2.sip_listen_port = 5060 @@ -490,11 +502,14 @@ account.2.sip_listen_port = 5060 {if $sip_transport_2 == 'tls'}account.2.transport = 2{/if} {if $sip_transport_2 == 'dns srv'}account.2.transport = 3{/if} +account.2.outbound_proxy.1.address = {$outbound_proxy_primary_2} +account.2.outbound_proxy.2.address = {$outbound_proxy_secondary_2} +account.2.outbound_proxy_enable = {if isset($outbound_proxy_primary_2)}1{else}0{/if} ####################################################################################### ## Failback ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.2.reregister_enable = 0 @@ -544,7 +559,7 @@ account.2.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -596,7 +611,7 @@ account.2.nat.rport = {$yealink_rport_2} ####################################################################################### ## Account2 Advance Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -611,7 +626,7 @@ voice_mail.number.2 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.2.subscribe_mwi = 1 @@ -626,7 +641,7 @@ account.2.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -643,7 +658,7 @@ account.2.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -960,7 +975,7 @@ network.internet_port.gateway = ####################################################################################### ## Account 3 Basic Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_3) } account.3.enable = 1 @@ -974,7 +989,6 @@ account.3.password = {$user_password_3} 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_proxy_enable = account.3.outbound_host = {$outbound_proxy_3} account.3.outbound_port = 5060 account.3.sip_listen_port = 5060 @@ -984,10 +998,14 @@ account.3.sip_listen_port = 5060 {if $sip_transport_3 == 'tls'}account.3.transport = 2{/if} {if $sip_transport_3 == 'dns srv'}account.3.transport = 3{/if} +account.3.outbound_proxy.1.address = {$outbound_proxy_primary_3} +account.3.outbound_proxy.2.address = {$outbound_proxy_secondary_3} +account.3.outbound_proxy_enable = {if isset($outbound_proxy_primary_3)}1{else}0{/if} + ####################################################################################### ## Failback ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.3.reregister_enable = 0 @@ -1037,7 +1055,7 @@ account.3.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -1089,7 +1107,7 @@ account.3.nat.rport = {$yealink_rport_3} ####################################################################################### ## Account3 Advance Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -1104,7 +1122,7 @@ voice_mail.number.3 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.3.subscribe_mwi = 1 @@ -1119,7 +1137,7 @@ account.3.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -1136,7 +1154,7 @@ account.3.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -1439,11 +1457,10 @@ 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 ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_4) } account.4.enable = 1 @@ -1457,7 +1474,6 @@ account.4.password = {$user_password_4} 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_proxy_enable = account.4.outbound_host = {$outbound_proxy_4} account.4.outbound_port = 5060 account.4.sip_listen_port = 5060 @@ -1467,10 +1483,14 @@ account.4.sip_listen_port = 5060 {if $sip_transport_4 == 'tls'}account.4.transport = 2{/if} {if $sip_transport_4 == 'dns srv'}account.4.transport = 3{/if} +account.4.outbound_proxy.1.address = {$outbound_proxy_primary_4} +account.4.outbound_proxy.2.address = {$outbound_proxy_secondary_4} +account.4.outbound_proxy_enable = {if isset($outbound_proxy_primary_4)}1{else}0{/if} + ####################################################################################### ## Failback ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.4.reregister_enable = 0 @@ -1520,7 +1540,7 @@ account.4.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -1572,7 +1592,7 @@ account.4.nat.rport = {$yealink_rport_4} ####################################################################################### ## Account4 Advance Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -1587,7 +1607,7 @@ voice_mail.number.4 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.4.subscribe_mwi = 1 @@ -1602,7 +1622,7 @@ account.4.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -1619,7 +1639,7 @@ account.4.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -1925,7 +1945,7 @@ network.internet_port.gateway = ####################################################################################### ## Account 5 Basic Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_5) } account.5.enable = 1 @@ -1939,7 +1959,6 @@ account.5.password = {$user_password_5} 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_proxy_enable = account.5.outbound_host = {$outbound_proxy_5} account.5.outbound_port = 5060 account.5.sip_listen_port = 5060 @@ -1949,10 +1968,14 @@ account.5.sip_listen_port = 5060 {if $sip_transport_5 == 'tls'}account.5.transport = 2{/if} {if $sip_transport_5 == 'dns srv'}account.5.transport = 3{/if} +account.5.outbound_proxy.1.address = {$outbound_proxy_primary_5} +account.5.outbound_proxy.2.address = {$outbound_proxy_secondary_5} +account.5.outbound_proxy_enable = {if isset($outbound_proxy_primary_5)}1{else}0{/if} + ####################################################################################### ## Failback ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.5.reregister_enable = 0 @@ -2002,7 +2025,7 @@ account.5.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -2054,7 +2077,7 @@ account.5.nat.rport = {$yealink_rport_5} ####################################################################################### ## Account5 Advance Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -2069,7 +2092,7 @@ voice_mail.number.5 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.5.subscribe_mwi = 1 @@ -2084,7 +2107,7 @@ account.5.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -2101,7 +2124,7 @@ account.5.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -2407,7 +2430,7 @@ network.internet_port.gateway = ####################################################################################### ## Account 6 Basic Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_6) } account.6.enable = 1 @@ -2421,7 +2444,6 @@ account.6.password = {$user_password_6} 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_proxy_enable = account.6.outbound_host = {$outbound_proxy_6} account.6.outbound_port = 5060 account.6.sip_listen_port = 5060 @@ -2431,10 +2453,14 @@ account.6.sip_listen_port = 5060 {if $sip_transport_6 == 'tls'}account.6.transport = 2{/if} {if $sip_transport_6 == 'dns srv'}account.6.transport = 3{/if} +account.6.outbound_proxy.1.address = {$outbound_proxy_primary_6} +account.6.outbound_proxy.2.address = {$outbound_proxy_secondary_6} +account.6.outbound_proxy_enable = {if isset($outbound_proxy_primary_6)}1{else}0{/if} + ####################################################################################### ## Failback ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.6.reregister_enable = 0 @@ -2484,7 +2510,7 @@ account.6.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -2513,7 +2539,7 @@ account.6.reg_fail_retry_interval = ######################################################################### ## NAT Settings ## ######################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.nat.nat_traversal = 0 #Enable or disable the NAT traversal; 0-Disabled (default), 1-STUN; @@ -2535,7 +2561,7 @@ account.6.nat.rport = {$yealink_rport_6} ####################################################################################### ## Account6 Advance Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -2550,14 +2576,14 @@ voice_mail.number.6 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = -account.6.subscribe_mwi = 1 +account.6.subscribe_mwi = 0 account.6.subscribe_mwi_expires = 3600 #Enable or disable the phone to subscribe to the voicemail through the message waiting indicator; 0-Disabled (default), 1-Enabled; -account.6.subscribe_mwi_to_vm = 1 +account.6.subscribe_mwi_to_vm = 0 account.6.subscribe_acd_expires= 3600 @@ -2565,7 +2591,7 @@ account.6.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -2582,7 +2608,7 @@ account.6.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -2957,6 +2983,17 @@ memorykey.{$row.device_key_id}.sub_type = #The value 0 of the "proramablekey.x.line" stands for Auto, it means the first available line. #But, when the programmable key is configured as Pick Up, the value 0 stands for line 1. +{foreach $keys as $row} + {if $row.device_key_category == "programmable"} + 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} + programablekey.{$row.device_key_id}.xml_phonebook = + programablekey.{$row.device_key_id}.history_type = + programablekey.{$row.device_key_id}.label = {$row.device_key_label} + {/if} +{/foreach} + #programablekey.x.value = #programablekey.x.xml_phonebook--Specify the desired remote phonebook/local group/BSFT phonebook for the programmable key. This parameter is only appilicable to the feature XML Group/Local Group/Broadsoft Group. #programablekey.x.history_type = @@ -3006,16 +3043,26 @@ programablekey.3.label = #expansion_module.x.key.y.label = #expansion_module.X.key.Y.xml_phonebook = +{$rownum = 1} + {foreach $keys as $row} {if $row.device_key_category == "expansion"} -#Expansion module 1 key {$row.device_key_id} +{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} expansion_module.1.key.{$row.device_key_id}.value = {$row.device_key_value} expansion_module.1.key.{$row.device_key_id}.extension = {$row.device_key_extension} expansion_module.1.key.{$row.device_key_id}.label = {$row.device_key_label} expansion_module.1.key.{$row.device_key_id}.xml_phonebook = - +{else} +expansion_module.2.key.{$row.device_key_id - 40}.type = {$row.device_key_type} +expansion_module.2.key.{$row.device_key_id - 40}.line = {$row.device_key_line} +expansion_module.2.key.{$row.device_key_id - 40}.value = {$row.device_key_value} +expansion_module.2.key.{$row.device_key_id - 40}.extension = {$row.device_key_extension} +expansion_module.2.key.{$row.device_key_id - 40}.label = {$row.device_key_label} +expansion_module.2.key.{$row.device_key_id - 40}.xml_phonebook = +{/if} +{$rownum = $rownum + 1} {/if} {/foreach} diff --git a/resources/templates/provision/yealink/t29g/{$mac}.cfg b/resources/templates/provision/yealink/t29g/{$mac}.cfg index 194338f4dd..2b5252843c 100644 --- a/resources/templates/provision/yealink/t29g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t29g/{$mac}.cfg @@ -5,7 +5,7 @@ ####################################################################################### ## Account 1 Basic Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_1) } account.1.enable = 1 @@ -19,7 +19,6 @@ account.1.password = {$user_password_1} 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_proxy_enable = account.1.outbound_host = {$outbound_proxy_1} account.1.outbound_port = 5060 account.1.sip_listen_port = 5060 @@ -29,11 +28,25 @@ account.1.sip_listen_port = 5060 {if $sip_transport_1 == 'tls'}account.1.transport = 2{/if} {if $sip_transport_1 == 'dns srv'}account.1.transport = 3{/if} +account.1.outbound_proxy.1.address = {$outbound_proxy_primary_1} +account.1.outbound_proxy.2.address = {$outbound_proxy_secondary_1} +account.1.outbound_proxy_enable = {if isset($outbound_proxy_primary_1)}1{else}0{/if} + +{if isset($outbound_proxy_1_port)} +account.1.outbound_proxy.1.port = {$outbound_proxy_1_port} +{else} +account.1.outbound_proxy.1.port = 5060 +{/if} +{if isset($outbound_proxy_1_port)} +account.1.outbound_proxy.2.port = {$outbound_proxy_2_port} +{else} +account.1.outbound_proxy.2.port = 5060 +{/if} ####################################################################################### ## Failback ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.1.reregister_enable = 0 @@ -87,7 +100,7 @@ account.1.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -139,7 +152,7 @@ account.1.nat.rport = {$yealink_rport_1} ####################################################################################### ## AccountX Advance Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -154,7 +167,7 @@ voice_mail.number.1 = {$voicemail_number} ####################################################################################### ## Subscribe ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.1.subscribe_mwi = 1 @@ -169,7 +182,7 @@ account.1.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -186,7 +199,7 @@ account.1.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -466,7 +479,7 @@ account.1.xsi.port = ####################################################################################### ## Account 2 Basic Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_2) } account.2.enable = 1 @@ -480,7 +493,6 @@ account.2.password = {$user_password_2} 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_proxy_enable = account.2.outbound_host = {$outbound_proxy_2} account.2.outbound_port = 5060 account.2.sip_listen_port = 5060 @@ -490,11 +502,14 @@ account.2.sip_listen_port = 5060 {if $sip_transport_2 == 'tls'}account.2.transport = 2{/if} {if $sip_transport_2 == 'dns srv'}account.2.transport = 3{/if} +account.2.outbound_proxy.1.address = {$outbound_proxy_primary_2} +account.2.outbound_proxy.2.address = {$outbound_proxy_secondary_2} +account.2.outbound_proxy_enable = {if isset($outbound_proxy_primary_2)}1{else}0{/if} ####################################################################################### ## Failback ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.2.reregister_enable = 0 @@ -544,7 +559,7 @@ account.2.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -596,7 +611,7 @@ account.2.nat.rport = {$yealink_rport_2} ####################################################################################### ## Account2 Advance Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -611,7 +626,7 @@ voice_mail.number.2 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.2.subscribe_mwi = 1 @@ -626,7 +641,7 @@ account.2.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -643,7 +658,7 @@ account.2.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -960,7 +975,7 @@ network.internet_port.gateway = ####################################################################################### ## Account 3 Basic Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_3) } account.3.enable = 1 @@ -974,7 +989,6 @@ account.3.password = {$user_password_3} 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_proxy_enable = account.3.outbound_host = {$outbound_proxy_3} account.3.outbound_port = 5060 account.3.sip_listen_port = 5060 @@ -984,10 +998,14 @@ account.3.sip_listen_port = 5060 {if $sip_transport_3 == 'tls'}account.3.transport = 2{/if} {if $sip_transport_3 == 'dns srv'}account.3.transport = 3{/if} +account.3.outbound_proxy.1.address = {$outbound_proxy_primary_3} +account.3.outbound_proxy.2.address = {$outbound_proxy_secondary_3} +account.3.outbound_proxy_enable = {if isset($outbound_proxy_primary_3)}1{else}0{/if} + ####################################################################################### ## Failback ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.3.reregister_enable = 0 @@ -1037,7 +1055,7 @@ account.3.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -1089,7 +1107,7 @@ account.3.nat.rport = {$yealink_rport_3} ####################################################################################### ## Account3 Advance Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -1104,7 +1122,7 @@ voice_mail.number.3 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.3.subscribe_mwi = 1 @@ -1119,7 +1137,7 @@ account.3.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -1136,7 +1154,7 @@ account.3.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -1439,11 +1457,10 @@ 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 ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_4) } account.4.enable = 1 @@ -1457,7 +1474,6 @@ account.4.password = {$user_password_4} 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_proxy_enable = account.4.outbound_host = {$outbound_proxy_4} account.4.outbound_port = 5060 account.4.sip_listen_port = 5060 @@ -1467,10 +1483,14 @@ account.4.sip_listen_port = 5060 {if $sip_transport_4 == 'tls'}account.4.transport = 2{/if} {if $sip_transport_4 == 'dns srv'}account.4.transport = 3{/if} +account.4.outbound_proxy.1.address = {$outbound_proxy_primary_4} +account.4.outbound_proxy.2.address = {$outbound_proxy_secondary_4} +account.4.outbound_proxy_enable = {if isset($outbound_proxy_primary_4)}1{else}0{/if} + ####################################################################################### ## Failback ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.4.reregister_enable = 0 @@ -1520,7 +1540,7 @@ account.4.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -1572,7 +1592,7 @@ account.4.nat.rport = {$yealink_rport_4} ####################################################################################### ## Account4 Advance Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -1587,7 +1607,7 @@ voice_mail.number.4 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.4.subscribe_mwi = 1 @@ -1602,7 +1622,7 @@ account.4.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -1619,7 +1639,7 @@ account.4.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -1925,7 +1945,7 @@ network.internet_port.gateway = ####################################################################################### ## Account 5 Basic Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_5) } account.5.enable = 1 @@ -1939,7 +1959,6 @@ account.5.password = {$user_password_5} 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_proxy_enable = account.5.outbound_host = {$outbound_proxy_5} account.5.outbound_port = 5060 account.5.sip_listen_port = 5060 @@ -1949,10 +1968,14 @@ account.5.sip_listen_port = 5060 {if $sip_transport_5 == 'tls'}account.5.transport = 2{/if} {if $sip_transport_5 == 'dns srv'}account.5.transport = 3{/if} +account.5.outbound_proxy.1.address = {$outbound_proxy_primary_5} +account.5.outbound_proxy.2.address = {$outbound_proxy_secondary_5} +account.5.outbound_proxy_enable = {if isset($outbound_proxy_primary_5)}1{else}0{/if} + ####################################################################################### ## Failback ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.5.reregister_enable = 0 @@ -2002,7 +2025,7 @@ account.5.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -2054,7 +2077,7 @@ account.5.nat.rport = {$yealink_rport_5} ####################################################################################### ## Account5 Advance Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -2069,7 +2092,7 @@ voice_mail.number.5 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.5.subscribe_mwi = 1 @@ -2084,7 +2107,7 @@ account.5.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -2101,7 +2124,7 @@ account.5.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -2407,7 +2430,7 @@ network.internet_port.gateway = ####################################################################################### ## Account 6 Basic Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_6) } account.6.enable = 1 @@ -2421,7 +2444,6 @@ account.6.password = {$user_password_6} 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_proxy_enable = account.6.outbound_host = {$outbound_proxy_6} account.6.outbound_port = 5060 account.6.sip_listen_port = 5060 @@ -2431,10 +2453,14 @@ account.6.sip_listen_port = 5060 {if $sip_transport_6 == 'tls'}account.6.transport = 2{/if} {if $sip_transport_6 == 'dns srv'}account.6.transport = 3{/if} +account.6.outbound_proxy.1.address = {$outbound_proxy_primary_6} +account.6.outbound_proxy.2.address = {$outbound_proxy_secondary_6} +account.6.outbound_proxy_enable = {if isset($outbound_proxy_primary_6)}1{else}0{/if} + ####################################################################################### ## Failback ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.6.reregister_enable = 0 @@ -2484,7 +2510,7 @@ account.6.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -2513,7 +2539,7 @@ account.6.reg_fail_retry_interval = ######################################################################### ## NAT Settings ## ######################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.nat.nat_traversal = 0 #Enable or disable the NAT traversal; 0-Disabled (default), 1-STUN; @@ -2535,7 +2561,7 @@ account.6.nat.rport = {$yealink_rport_6} ####################################################################################### ## Account6 Advance Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -2550,14 +2576,14 @@ voice_mail.number.6 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = -account.6.subscribe_mwi = 1 +account.6.subscribe_mwi = 0 account.6.subscribe_mwi_expires = 3600 #Enable or disable the phone to subscribe to the voicemail through the message waiting indicator; 0-Disabled (default), 1-Enabled; -account.6.subscribe_mwi_to_vm = 1 +account.6.subscribe_mwi_to_vm = 0 account.6.subscribe_acd_expires= 3600 @@ -2565,7 +2591,7 @@ account.6.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -2582,7 +2608,7 @@ account.6.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -2957,6 +2983,17 @@ memorykey.{$row.device_key_id}.sub_type = #The value 0 of the "proramablekey.x.line" stands for Auto, it means the first available line. #But, when the programmable key is configured as Pick Up, the value 0 stands for line 1. +{foreach $keys as $row} + {if $row.device_key_category == "programmable"} + 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} + programablekey.{$row.device_key_id}.xml_phonebook = + programablekey.{$row.device_key_id}.history_type = + programablekey.{$row.device_key_id}.label = {$row.device_key_label} + {/if} +{/foreach} + #programablekey.x.value = #programablekey.x.xml_phonebook--Specify the desired remote phonebook/local group/BSFT phonebook for the programmable key. This parameter is only appilicable to the feature XML Group/Local Group/Broadsoft Group. #programablekey.x.history_type = @@ -2995,7 +3032,6 @@ programablekey.3.label = #programablekey.4.history_type = #programablekey.4.label = - ########################################################################################## ## Expansion Module 1 ## ########################################################################################## @@ -3007,16 +3043,26 @@ programablekey.3.label = #expansion_module.x.key.y.label = #expansion_module.X.key.Y.xml_phonebook = +{$rownum = 1} + {foreach $keys as $row} {if $row.device_key_category == "expansion"} -#Expansion module 1 key {$row.device_key_id} +{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} expansion_module.1.key.{$row.device_key_id}.value = {$row.device_key_value} expansion_module.1.key.{$row.device_key_id}.extension = {$row.device_key_extension} expansion_module.1.key.{$row.device_key_id}.label = {$row.device_key_label} expansion_module.1.key.{$row.device_key_id}.xml_phonebook = - +{else} +expansion_module.2.key.{$row.device_key_id - 40}.type = {$row.device_key_type} +expansion_module.2.key.{$row.device_key_id - 40}.line = {$row.device_key_line} +expansion_module.2.key.{$row.device_key_id - 40}.value = {$row.device_key_value} +expansion_module.2.key.{$row.device_key_id - 40}.extension = {$row.device_key_extension} +expansion_module.2.key.{$row.device_key_id - 40}.label = {$row.device_key_label} +expansion_module.2.key.{$row.device_key_id - 40}.xml_phonebook = +{/if} +{$rownum = $rownum + 1} {/if} {/foreach} diff --git a/resources/templates/provision/yealink/t41p/{$mac}.cfg b/resources/templates/provision/yealink/t41p/{$mac}.cfg index 194338f4dd..2b5252843c 100644 --- a/resources/templates/provision/yealink/t41p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t41p/{$mac}.cfg @@ -5,7 +5,7 @@ ####################################################################################### ## Account 1 Basic Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_1) } account.1.enable = 1 @@ -19,7 +19,6 @@ account.1.password = {$user_password_1} 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_proxy_enable = account.1.outbound_host = {$outbound_proxy_1} account.1.outbound_port = 5060 account.1.sip_listen_port = 5060 @@ -29,11 +28,25 @@ account.1.sip_listen_port = 5060 {if $sip_transport_1 == 'tls'}account.1.transport = 2{/if} {if $sip_transport_1 == 'dns srv'}account.1.transport = 3{/if} +account.1.outbound_proxy.1.address = {$outbound_proxy_primary_1} +account.1.outbound_proxy.2.address = {$outbound_proxy_secondary_1} +account.1.outbound_proxy_enable = {if isset($outbound_proxy_primary_1)}1{else}0{/if} + +{if isset($outbound_proxy_1_port)} +account.1.outbound_proxy.1.port = {$outbound_proxy_1_port} +{else} +account.1.outbound_proxy.1.port = 5060 +{/if} +{if isset($outbound_proxy_1_port)} +account.1.outbound_proxy.2.port = {$outbound_proxy_2_port} +{else} +account.1.outbound_proxy.2.port = 5060 +{/if} ####################################################################################### ## Failback ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.1.reregister_enable = 0 @@ -87,7 +100,7 @@ account.1.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -139,7 +152,7 @@ account.1.nat.rport = {$yealink_rport_1} ####################################################################################### ## AccountX Advance Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -154,7 +167,7 @@ voice_mail.number.1 = {$voicemail_number} ####################################################################################### ## Subscribe ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.1.subscribe_mwi = 1 @@ -169,7 +182,7 @@ account.1.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -186,7 +199,7 @@ account.1.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -466,7 +479,7 @@ account.1.xsi.port = ####################################################################################### ## Account 2 Basic Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_2) } account.2.enable = 1 @@ -480,7 +493,6 @@ account.2.password = {$user_password_2} 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_proxy_enable = account.2.outbound_host = {$outbound_proxy_2} account.2.outbound_port = 5060 account.2.sip_listen_port = 5060 @@ -490,11 +502,14 @@ account.2.sip_listen_port = 5060 {if $sip_transport_2 == 'tls'}account.2.transport = 2{/if} {if $sip_transport_2 == 'dns srv'}account.2.transport = 3{/if} +account.2.outbound_proxy.1.address = {$outbound_proxy_primary_2} +account.2.outbound_proxy.2.address = {$outbound_proxy_secondary_2} +account.2.outbound_proxy_enable = {if isset($outbound_proxy_primary_2)}1{else}0{/if} ####################################################################################### ## Failback ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.2.reregister_enable = 0 @@ -544,7 +559,7 @@ account.2.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -596,7 +611,7 @@ account.2.nat.rport = {$yealink_rport_2} ####################################################################################### ## Account2 Advance Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -611,7 +626,7 @@ voice_mail.number.2 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.2.subscribe_mwi = 1 @@ -626,7 +641,7 @@ account.2.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -643,7 +658,7 @@ account.2.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -960,7 +975,7 @@ network.internet_port.gateway = ####################################################################################### ## Account 3 Basic Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_3) } account.3.enable = 1 @@ -974,7 +989,6 @@ account.3.password = {$user_password_3} 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_proxy_enable = account.3.outbound_host = {$outbound_proxy_3} account.3.outbound_port = 5060 account.3.sip_listen_port = 5060 @@ -984,10 +998,14 @@ account.3.sip_listen_port = 5060 {if $sip_transport_3 == 'tls'}account.3.transport = 2{/if} {if $sip_transport_3 == 'dns srv'}account.3.transport = 3{/if} +account.3.outbound_proxy.1.address = {$outbound_proxy_primary_3} +account.3.outbound_proxy.2.address = {$outbound_proxy_secondary_3} +account.3.outbound_proxy_enable = {if isset($outbound_proxy_primary_3)}1{else}0{/if} + ####################################################################################### ## Failback ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.3.reregister_enable = 0 @@ -1037,7 +1055,7 @@ account.3.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -1089,7 +1107,7 @@ account.3.nat.rport = {$yealink_rport_3} ####################################################################################### ## Account3 Advance Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -1104,7 +1122,7 @@ voice_mail.number.3 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.3.subscribe_mwi = 1 @@ -1119,7 +1137,7 @@ account.3.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -1136,7 +1154,7 @@ account.3.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -1439,11 +1457,10 @@ 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 ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_4) } account.4.enable = 1 @@ -1457,7 +1474,6 @@ account.4.password = {$user_password_4} 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_proxy_enable = account.4.outbound_host = {$outbound_proxy_4} account.4.outbound_port = 5060 account.4.sip_listen_port = 5060 @@ -1467,10 +1483,14 @@ account.4.sip_listen_port = 5060 {if $sip_transport_4 == 'tls'}account.4.transport = 2{/if} {if $sip_transport_4 == 'dns srv'}account.4.transport = 3{/if} +account.4.outbound_proxy.1.address = {$outbound_proxy_primary_4} +account.4.outbound_proxy.2.address = {$outbound_proxy_secondary_4} +account.4.outbound_proxy_enable = {if isset($outbound_proxy_primary_4)}1{else}0{/if} + ####################################################################################### ## Failback ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.4.reregister_enable = 0 @@ -1520,7 +1540,7 @@ account.4.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -1572,7 +1592,7 @@ account.4.nat.rport = {$yealink_rport_4} ####################################################################################### ## Account4 Advance Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -1587,7 +1607,7 @@ voice_mail.number.4 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.4.subscribe_mwi = 1 @@ -1602,7 +1622,7 @@ account.4.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -1619,7 +1639,7 @@ account.4.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -1925,7 +1945,7 @@ network.internet_port.gateway = ####################################################################################### ## Account 5 Basic Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_5) } account.5.enable = 1 @@ -1939,7 +1959,6 @@ account.5.password = {$user_password_5} 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_proxy_enable = account.5.outbound_host = {$outbound_proxy_5} account.5.outbound_port = 5060 account.5.sip_listen_port = 5060 @@ -1949,10 +1968,14 @@ account.5.sip_listen_port = 5060 {if $sip_transport_5 == 'tls'}account.5.transport = 2{/if} {if $sip_transport_5 == 'dns srv'}account.5.transport = 3{/if} +account.5.outbound_proxy.1.address = {$outbound_proxy_primary_5} +account.5.outbound_proxy.2.address = {$outbound_proxy_secondary_5} +account.5.outbound_proxy_enable = {if isset($outbound_proxy_primary_5)}1{else}0{/if} + ####################################################################################### ## Failback ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.5.reregister_enable = 0 @@ -2002,7 +2025,7 @@ account.5.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -2054,7 +2077,7 @@ account.5.nat.rport = {$yealink_rport_5} ####################################################################################### ## Account5 Advance Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -2069,7 +2092,7 @@ voice_mail.number.5 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.5.subscribe_mwi = 1 @@ -2084,7 +2107,7 @@ account.5.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -2101,7 +2124,7 @@ account.5.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -2407,7 +2430,7 @@ network.internet_port.gateway = ####################################################################################### ## Account 6 Basic Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_6) } account.6.enable = 1 @@ -2421,7 +2444,6 @@ account.6.password = {$user_password_6} 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_proxy_enable = account.6.outbound_host = {$outbound_proxy_6} account.6.outbound_port = 5060 account.6.sip_listen_port = 5060 @@ -2431,10 +2453,14 @@ account.6.sip_listen_port = 5060 {if $sip_transport_6 == 'tls'}account.6.transport = 2{/if} {if $sip_transport_6 == 'dns srv'}account.6.transport = 3{/if} +account.6.outbound_proxy.1.address = {$outbound_proxy_primary_6} +account.6.outbound_proxy.2.address = {$outbound_proxy_secondary_6} +account.6.outbound_proxy_enable = {if isset($outbound_proxy_primary_6)}1{else}0{/if} + ####################################################################################### ## Failback ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.6.reregister_enable = 0 @@ -2484,7 +2510,7 @@ account.6.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -2513,7 +2539,7 @@ account.6.reg_fail_retry_interval = ######################################################################### ## NAT Settings ## ######################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.nat.nat_traversal = 0 #Enable or disable the NAT traversal; 0-Disabled (default), 1-STUN; @@ -2535,7 +2561,7 @@ account.6.nat.rport = {$yealink_rport_6} ####################################################################################### ## Account6 Advance Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -2550,14 +2576,14 @@ voice_mail.number.6 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = -account.6.subscribe_mwi = 1 +account.6.subscribe_mwi = 0 account.6.subscribe_mwi_expires = 3600 #Enable or disable the phone to subscribe to the voicemail through the message waiting indicator; 0-Disabled (default), 1-Enabled; -account.6.subscribe_mwi_to_vm = 1 +account.6.subscribe_mwi_to_vm = 0 account.6.subscribe_acd_expires= 3600 @@ -2565,7 +2591,7 @@ account.6.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -2582,7 +2608,7 @@ account.6.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -2957,6 +2983,17 @@ memorykey.{$row.device_key_id}.sub_type = #The value 0 of the "proramablekey.x.line" stands for Auto, it means the first available line. #But, when the programmable key is configured as Pick Up, the value 0 stands for line 1. +{foreach $keys as $row} + {if $row.device_key_category == "programmable"} + 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} + programablekey.{$row.device_key_id}.xml_phonebook = + programablekey.{$row.device_key_id}.history_type = + programablekey.{$row.device_key_id}.label = {$row.device_key_label} + {/if} +{/foreach} + #programablekey.x.value = #programablekey.x.xml_phonebook--Specify the desired remote phonebook/local group/BSFT phonebook for the programmable key. This parameter is only appilicable to the feature XML Group/Local Group/Broadsoft Group. #programablekey.x.history_type = @@ -2995,7 +3032,6 @@ programablekey.3.label = #programablekey.4.history_type = #programablekey.4.label = - ########################################################################################## ## Expansion Module 1 ## ########################################################################################## @@ -3007,16 +3043,26 @@ programablekey.3.label = #expansion_module.x.key.y.label = #expansion_module.X.key.Y.xml_phonebook = +{$rownum = 1} + {foreach $keys as $row} {if $row.device_key_category == "expansion"} -#Expansion module 1 key {$row.device_key_id} +{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} expansion_module.1.key.{$row.device_key_id}.value = {$row.device_key_value} expansion_module.1.key.{$row.device_key_id}.extension = {$row.device_key_extension} expansion_module.1.key.{$row.device_key_id}.label = {$row.device_key_label} expansion_module.1.key.{$row.device_key_id}.xml_phonebook = - +{else} +expansion_module.2.key.{$row.device_key_id - 40}.type = {$row.device_key_type} +expansion_module.2.key.{$row.device_key_id - 40}.line = {$row.device_key_line} +expansion_module.2.key.{$row.device_key_id - 40}.value = {$row.device_key_value} +expansion_module.2.key.{$row.device_key_id - 40}.extension = {$row.device_key_extension} +expansion_module.2.key.{$row.device_key_id - 40}.label = {$row.device_key_label} +expansion_module.2.key.{$row.device_key_id - 40}.xml_phonebook = +{/if} +{$rownum = $rownum + 1} {/if} {/foreach} diff --git a/resources/templates/provision/yealink/t42g/{$mac}.cfg b/resources/templates/provision/yealink/t42g/{$mac}.cfg index fc5dd9f3fc..036c4f1674 100644 --- a/resources/templates/provision/yealink/t42g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t42g/{$mac}.cfg @@ -5,7 +5,7 @@ ####################################################################################### ## Account 1 Basic Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_1) } account.1.enable = 1 @@ -19,7 +19,6 @@ account.1.password = {$user_password_1} 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_proxy_enable = account.1.outbound_host = {$outbound_proxy_1} account.1.outbound_port = 5060 account.1.sip_listen_port = 5060 @@ -29,11 +28,25 @@ account.1.sip_listen_port = 5060 {if $sip_transport_1 == 'tls'}account.1.transport = 2{/if} {if $sip_transport_1 == 'dns srv'}account.1.transport = 3{/if} +account.1.outbound_proxy.1.address = {$outbound_proxy_primary_1} +account.1.outbound_proxy.2.address = {$outbound_proxy_secondary_1} +account.1.outbound_proxy_enable = {if isset($outbound_proxy_primary_1)}1{else}0{/if} + +{if isset($outbound_proxy_1_port)} +account.1.outbound_proxy.1.port = {$outbound_proxy_1_port} +{else} +account.1.outbound_proxy.1.port = 5060 +{/if} +{if isset($outbound_proxy_1_port)} +account.1.outbound_proxy.2.port = {$outbound_proxy_2_port} +{else} +account.1.outbound_proxy.2.port = 5060 +{/if} ####################################################################################### ## Failback ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.1.reregister_enable = 0 @@ -87,7 +100,7 @@ account.1.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -139,7 +152,7 @@ account.1.nat.rport = {$yealink_rport_1} ####################################################################################### ## AccountX Advance Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -154,7 +167,7 @@ voice_mail.number.1 = {$voicemail_number} ####################################################################################### ## Subscribe ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.1.subscribe_mwi = 1 @@ -169,7 +182,7 @@ account.1.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -186,7 +199,7 @@ account.1.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -466,7 +479,7 @@ account.1.xsi.port = ####################################################################################### ## Account 2 Basic Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_2) } account.2.enable = 1 @@ -480,7 +493,6 @@ account.2.password = {$user_password_2} 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_proxy_enable = account.2.outbound_host = {$outbound_proxy_2} account.2.outbound_port = 5060 account.2.sip_listen_port = 5060 @@ -490,11 +502,14 @@ account.2.sip_listen_port = 5060 {if $sip_transport_2 == 'tls'}account.2.transport = 2{/if} {if $sip_transport_2 == 'dns srv'}account.2.transport = 3{/if} +account.2.outbound_proxy.1.address = {$outbound_proxy_primary_2} +account.2.outbound_proxy.2.address = {$outbound_proxy_secondary_2} +account.2.outbound_proxy_enable = {if isset($outbound_proxy_primary_2)}1{else}0{/if} ####################################################################################### ## Failback ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.2.reregister_enable = 0 @@ -544,7 +559,7 @@ account.2.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -596,7 +611,7 @@ account.2.nat.rport = {$yealink_rport_2} ####################################################################################### ## Account2 Advance Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -611,7 +626,7 @@ voice_mail.number.2 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.2.subscribe_mwi = 1 @@ -626,7 +641,7 @@ account.2.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -643,7 +658,7 @@ account.2.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -960,7 +975,7 @@ network.internet_port.gateway = ####################################################################################### ## Account 3 Basic Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_3) } account.3.enable = 1 @@ -974,7 +989,6 @@ account.3.password = {$user_password_3} 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_proxy_enable = account.3.outbound_host = {$outbound_proxy_3} account.3.outbound_port = 5060 account.3.sip_listen_port = 5060 @@ -984,10 +998,14 @@ account.3.sip_listen_port = 5060 {if $sip_transport_3 == 'tls'}account.3.transport = 2{/if} {if $sip_transport_3 == 'dns srv'}account.3.transport = 3{/if} +account.3.outbound_proxy.1.address = {$outbound_proxy_primary_3} +account.3.outbound_proxy.2.address = {$outbound_proxy_secondary_3} +account.3.outbound_proxy_enable = {if isset($outbound_proxy_primary_3)}1{else}0{/if} + ####################################################################################### ## Failback ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.3.reregister_enable = 0 @@ -1037,7 +1055,7 @@ account.3.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -1089,7 +1107,7 @@ account.3.nat.rport = {$yealink_rport_3} ####################################################################################### ## Account3 Advance Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -1104,7 +1122,7 @@ voice_mail.number.3 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.3.subscribe_mwi = 1 @@ -1119,7 +1137,7 @@ account.3.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -1136,7 +1154,7 @@ account.3.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -1439,11 +1457,10 @@ 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 ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_4) } account.4.enable = 1 @@ -1457,7 +1474,6 @@ account.4.password = {$user_password_4} 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_proxy_enable = account.4.outbound_host = {$outbound_proxy_4} account.4.outbound_port = 5060 account.4.sip_listen_port = 5060 @@ -1467,10 +1483,14 @@ account.4.sip_listen_port = 5060 {if $sip_transport_4 == 'tls'}account.4.transport = 2{/if} {if $sip_transport_4 == 'dns srv'}account.4.transport = 3{/if} +account.4.outbound_proxy.1.address = {$outbound_proxy_primary_4} +account.4.outbound_proxy.2.address = {$outbound_proxy_secondary_4} +account.4.outbound_proxy_enable = {if isset($outbound_proxy_primary_4)}1{else}0{/if} + ####################################################################################### ## Failback ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.4.reregister_enable = 0 @@ -1520,7 +1540,7 @@ account.4.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -1572,7 +1592,7 @@ account.4.nat.rport = {$yealink_rport_4} ####################################################################################### ## Account4 Advance Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -1587,7 +1607,7 @@ voice_mail.number.4 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.4.subscribe_mwi = 1 @@ -1602,7 +1622,7 @@ account.4.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -1619,7 +1639,7 @@ account.4.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -1925,7 +1945,7 @@ network.internet_port.gateway = ####################################################################################### ## Account 5 Basic Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_5) } account.5.enable = 1 @@ -1939,7 +1959,6 @@ account.5.password = {$user_password_5} 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_proxy_enable = account.5.outbound_host = {$outbound_proxy_5} account.5.outbound_port = 5060 account.5.sip_listen_port = 5060 @@ -1949,10 +1968,14 @@ account.5.sip_listen_port = 5060 {if $sip_transport_5 == 'tls'}account.5.transport = 2{/if} {if $sip_transport_5 == 'dns srv'}account.5.transport = 3{/if} +account.5.outbound_proxy.1.address = {$outbound_proxy_primary_5} +account.5.outbound_proxy.2.address = {$outbound_proxy_secondary_5} +account.5.outbound_proxy_enable = {if isset($outbound_proxy_primary_5)}1{else}0{/if} + ####################################################################################### ## Failback ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.5.reregister_enable = 0 @@ -2002,7 +2025,7 @@ account.5.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -2054,7 +2077,7 @@ account.5.nat.rport = {$yealink_rport_5} ####################################################################################### ## Account5 Advance Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -2069,7 +2092,7 @@ voice_mail.number.5 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.5.subscribe_mwi = 1 @@ -2084,7 +2107,7 @@ account.5.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -2101,7 +2124,7 @@ account.5.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -2407,7 +2430,7 @@ network.internet_port.gateway = ####################################################################################### ## Account 6 Basic Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_6) } account.6.enable = 1 @@ -2421,7 +2444,6 @@ account.6.password = {$user_password_6} 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_proxy_enable = account.6.outbound_host = {$outbound_proxy_6} account.6.outbound_port = 5060 account.6.sip_listen_port = 5060 @@ -2431,10 +2453,14 @@ account.6.sip_listen_port = 5060 {if $sip_transport_6 == 'tls'}account.6.transport = 2{/if} {if $sip_transport_6 == 'dns srv'}account.6.transport = 3{/if} +account.6.outbound_proxy.1.address = {$outbound_proxy_primary_6} +account.6.outbound_proxy.2.address = {$outbound_proxy_secondary_6} +account.6.outbound_proxy_enable = {if isset($outbound_proxy_primary_6)}1{else}0{/if} + ####################################################################################### ## Failback ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.6.reregister_enable = 0 @@ -2484,7 +2510,7 @@ account.6.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -2513,7 +2539,7 @@ account.6.reg_fail_retry_interval = ######################################################################### ## NAT Settings ## ######################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.nat.nat_traversal = 0 #Enable or disable the NAT traversal; 0-Disabled (default), 1-STUN; @@ -2535,7 +2561,7 @@ account.6.nat.rport = {$yealink_rport_6} ####################################################################################### ## Account6 Advance Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -2550,14 +2576,14 @@ voice_mail.number.6 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = -account.6.subscribe_mwi = 1 +account.6.subscribe_mwi = 0 account.6.subscribe_mwi_expires = 3600 #Enable or disable the phone to subscribe to the voicemail through the message waiting indicator; 0-Disabled (default), 1-Enabled; -account.6.subscribe_mwi_to_vm = 1 +account.6.subscribe_mwi_to_vm = 0 account.6.subscribe_acd_expires= 3600 @@ -2565,7 +2591,7 @@ account.6.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -2582,7 +2608,7 @@ account.6.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -2957,6 +2983,17 @@ memorykey.{$row.device_key_id}.sub_type = #The value 0 of the "proramablekey.x.line" stands for Auto, it means the first available line. #But, when the programmable key is configured as Pick Up, the value 0 stands for line 1. +{foreach $keys as $row} + {if $row.device_key_category == "programmable"} + 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} + programablekey.{$row.device_key_id}.xml_phonebook = + programablekey.{$row.device_key_id}.history_type = + programablekey.{$row.device_key_id}.label = {$row.device_key_label} + {/if} +{/foreach} + #programablekey.x.value = #programablekey.x.xml_phonebook--Specify the desired remote phonebook/local group/BSFT phonebook for the programmable key. This parameter is only appilicable to the feature XML Group/Local Group/Broadsoft Group. #programablekey.x.history_type = @@ -3007,16 +3044,26 @@ programablekey.3.label = #expansion_module.x.key.y.label = #expansion_module.X.key.Y.xml_phonebook = +{$rownum = 1} + {foreach $keys as $row} {if $row.device_key_category == "expansion"} -#Expansion module 1 key {$row.device_key_id} +{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} expansion_module.1.key.{$row.device_key_id}.value = {$row.device_key_value} expansion_module.1.key.{$row.device_key_id}.extension = {$row.device_key_extension} expansion_module.1.key.{$row.device_key_id}.label = {$row.device_key_label} expansion_module.1.key.{$row.device_key_id}.xml_phonebook = - +{else} +expansion_module.2.key.{$row.device_key_id - 40}.type = {$row.device_key_type} +expansion_module.2.key.{$row.device_key_id - 40}.line = {$row.device_key_line} +expansion_module.2.key.{$row.device_key_id - 40}.value = {$row.device_key_value} +expansion_module.2.key.{$row.device_key_id - 40}.extension = {$row.device_key_extension} +expansion_module.2.key.{$row.device_key_id - 40}.label = {$row.device_key_label} +expansion_module.2.key.{$row.device_key_id - 40}.xml_phonebook = +{/if} +{$rownum = $rownum + 1} {/if} {/foreach} diff --git a/resources/templates/provision/yealink/t46g/{$mac}.cfg b/resources/templates/provision/yealink/t46g/{$mac}.cfg index e5a47bfce7..602e188bd7 100644 --- a/resources/templates/provision/yealink/t46g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t46g/{$mac}.cfg @@ -5,7 +5,7 @@ ####################################################################################### ## Account 1 Basic Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_1) } account.1.enable = 1 @@ -19,7 +19,6 @@ account.1.password = {$user_password_1} 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_proxy_enable = account.1.outbound_host = {$outbound_proxy_1} account.1.outbound_port = 5060 account.1.sip_listen_port = 5060 @@ -29,9 +28,10 @@ account.1.sip_listen_port = 5060 {if $sip_transport_1 == 'tls'}account.1.transport = 2{/if} {if $sip_transport_1 == 'dns srv'}account.1.transport = 3{/if} -account.1.outbound_proxy.1.address = {$outbound_proxy_1_address} -account.1.outbound_proxy.2.address = {$outbound_proxy_2_address} -account.1.outbound_proxy_enable = {$outbound_proxy_enabled} +account.1.outbound_proxy.1.address = {$outbound_proxy_primary_1} +account.1.outbound_proxy.2.address = {$outbound_proxy_secondary_1} +account.1.outbound_proxy_enable = {if isset($outbound_proxy_primary_1)}1{else}0{/if} + {if isset($outbound_proxy_1_port)} account.1.outbound_proxy.1.port = {$outbound_proxy_1_port} {else} @@ -46,7 +46,7 @@ account.1.outbound_proxy.2.port = 5060 ####################################################################################### ## Failback ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.1.reregister_enable = 0 @@ -100,7 +100,7 @@ account.1.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -152,7 +152,7 @@ account.1.nat.rport = {$yealink_rport_1} ####################################################################################### ## AccountX Advance Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -167,7 +167,7 @@ voice_mail.number.1 = {$voicemail_number} ####################################################################################### ## Subscribe ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.1.subscribe_mwi = 1 @@ -182,7 +182,7 @@ account.1.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -199,7 +199,7 @@ account.1.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -479,7 +479,7 @@ account.1.xsi.port = ####################################################################################### ## Account 2 Basic Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_2) } account.2.enable = 1 @@ -493,7 +493,6 @@ account.2.password = {$user_password_2} 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_proxy_enable = account.2.outbound_host = {$outbound_proxy_2} account.2.outbound_port = 5060 account.2.sip_listen_port = 5060 @@ -503,14 +502,14 @@ account.2.sip_listen_port = 5060 {if $sip_transport_2 == 'tls'}account.2.transport = 2{/if} {if $sip_transport_2 == 'dns srv'}account.2.transport = 3{/if} -account.2.outbound_proxy.1.address = {$line_2_outbound_proxy_primary} -account.2.outbound_proxy.2.address = {$line_2_outbound_proxy_secondary} -account.2.outbound_proxy_enable = {$line_2_outbound_proxy_enabled} +account.2.outbound_proxy.1.address = {$outbound_proxy_primary_2} +account.2.outbound_proxy.2.address = {$outbound_proxy_secondary_2} +account.2.outbound_proxy_enable = {if isset($outbound_proxy_primary_2)}1{else}0{/if} ####################################################################################### ## Failback ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.2.reregister_enable = 0 @@ -560,7 +559,7 @@ account.2.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -612,7 +611,7 @@ account.2.nat.rport = {$yealink_rport_2} ####################################################################################### ## Account2 Advance Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -627,7 +626,7 @@ voice_mail.number.2 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.2.subscribe_mwi = 1 @@ -642,7 +641,7 @@ account.2.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -659,7 +658,7 @@ account.2.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -976,7 +975,7 @@ network.internet_port.gateway = ####################################################################################### ## Account 3 Basic Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_3) } account.3.enable = 1 @@ -990,7 +989,6 @@ account.3.password = {$user_password_3} 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_proxy_enable = account.3.outbound_host = {$outbound_proxy_3} account.3.outbound_port = 5060 account.3.sip_listen_port = 5060 @@ -1000,10 +998,14 @@ account.3.sip_listen_port = 5060 {if $sip_transport_3 == 'tls'}account.3.transport = 2{/if} {if $sip_transport_3 == 'dns srv'}account.3.transport = 3{/if} +account.3.outbound_proxy.1.address = {$outbound_proxy_primary_3} +account.3.outbound_proxy.2.address = {$outbound_proxy_secondary_3} +account.3.outbound_proxy_enable = {if isset($outbound_proxy_primary_3)}1{else}0{/if} + ####################################################################################### ## Failback ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.3.reregister_enable = 0 @@ -1053,7 +1055,7 @@ account.3.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -1105,7 +1107,7 @@ account.3.nat.rport = {$yealink_rport_3} ####################################################################################### ## Account3 Advance Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -1120,7 +1122,7 @@ voice_mail.number.3 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.3.subscribe_mwi = 1 @@ -1135,7 +1137,7 @@ account.3.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -1152,7 +1154,7 @@ account.3.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -1455,11 +1457,10 @@ 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 ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_4) } account.4.enable = 1 @@ -1473,7 +1474,6 @@ account.4.password = {$user_password_4} 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_proxy_enable = account.4.outbound_host = {$outbound_proxy_4} account.4.outbound_port = 5060 account.4.sip_listen_port = 5060 @@ -1483,10 +1483,14 @@ account.4.sip_listen_port = 5060 {if $sip_transport_4 == 'tls'}account.4.transport = 2{/if} {if $sip_transport_4 == 'dns srv'}account.4.transport = 3{/if} +account.4.outbound_proxy.1.address = {$outbound_proxy_primary_4} +account.4.outbound_proxy.2.address = {$outbound_proxy_secondary_4} +account.4.outbound_proxy_enable = {if isset($outbound_proxy_primary_4)}1{else}0{/if} + ####################################################################################### ## Failback ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.4.reregister_enable = 0 @@ -1536,7 +1540,7 @@ account.4.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -1588,7 +1592,7 @@ account.4.nat.rport = {$yealink_rport_4} ####################################################################################### ## Account4 Advance Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -1603,7 +1607,7 @@ voice_mail.number.4 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.4.subscribe_mwi = 1 @@ -1618,7 +1622,7 @@ account.4.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -1635,7 +1639,7 @@ account.4.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -1941,7 +1945,7 @@ network.internet_port.gateway = ####################################################################################### ## Account 5 Basic Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_5) } account.5.enable = 1 @@ -1955,7 +1959,6 @@ account.5.password = {$user_password_5} 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_proxy_enable = account.5.outbound_host = {$outbound_proxy_5} account.5.outbound_port = 5060 account.5.sip_listen_port = 5060 @@ -1965,10 +1968,14 @@ account.5.sip_listen_port = 5060 {if $sip_transport_5 == 'tls'}account.5.transport = 2{/if} {if $sip_transport_5 == 'dns srv'}account.5.transport = 3{/if} +account.5.outbound_proxy.1.address = {$outbound_proxy_primary_5} +account.5.outbound_proxy.2.address = {$outbound_proxy_secondary_5} +account.5.outbound_proxy_enable = {if isset($outbound_proxy_primary_5)}1{else}0{/if} + ####################################################################################### ## Failback ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.5.reregister_enable = 0 @@ -2018,7 +2025,7 @@ account.5.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -2070,7 +2077,7 @@ account.5.nat.rport = {$yealink_rport_5} ####################################################################################### ## Account5 Advance Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -2085,7 +2092,7 @@ voice_mail.number.5 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = account.5.subscribe_mwi = 1 @@ -2100,7 +2107,7 @@ account.5.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -2117,7 +2124,7 @@ account.5.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -2423,7 +2430,7 @@ network.internet_port.gateway = ####################################################################################### ## Account 6 Basic Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.enable = {if isset($user_password_6) } account.6.enable = 1 @@ -2437,7 +2444,6 @@ account.6.password = {$user_password_6} 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_proxy_enable = account.6.outbound_host = {$outbound_proxy_6} account.6.outbound_port = 5060 account.6.sip_listen_port = 5060 @@ -2447,10 +2453,14 @@ account.6.sip_listen_port = 5060 {if $sip_transport_6 == 'tls'}account.6.transport = 2{/if} {if $sip_transport_6 == 'dns srv'}account.6.transport = 3{/if} +account.6.outbound_proxy.1.address = {$outbound_proxy_primary_6} +account.6.outbound_proxy.2.address = {$outbound_proxy_secondary_6} +account.6.outbound_proxy_enable = {if isset($outbound_proxy_primary_6)}1{else}0{/if} + ####################################################################################### ## Failback ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.reregister_enable = 0 account.6.reregister_enable = 0 @@ -2500,7 +2510,7 @@ account.6.static_cache_pri = 0 ####################################################################################### ## Register Advanced ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.sip_server_type = #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; @@ -2529,7 +2539,7 @@ account.6.reg_fail_retry_interval = ######################################################################### ## NAT Settings ## ######################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.nat.nat_traversal = 0 #Enable or disable the NAT traversal; 0-Disabled (default), 1-STUN; @@ -2551,7 +2561,7 @@ account.6.nat.rport = {$yealink_rport_6} ####################################################################################### ## Account6 Advance Settings ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.advanced.timer_t1 = 0.5 ##voice_mail.number.X = @@ -2566,14 +2576,14 @@ voice_mail.number.6 = *97 ####################################################################################### ## Subscribe ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.subscribe_mwi = -account.6.subscribe_mwi = 1 +account.6.subscribe_mwi = 0 account.6.subscribe_mwi_expires = 3600 #Enable or disable the phone to subscribe to the voicemail through the message waiting indicator; 0-Disabled (default), 1-Enabled; -account.6.subscribe_mwi_to_vm = 1 +account.6.subscribe_mwi_to_vm = 0 account.6.subscribe_acd_expires= 3600 @@ -2581,7 +2591,7 @@ account.6.subscribe_acd_expires= 3600 ####################################################################################### ## BLF List ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.blf.blf_list_uri = #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist". @@ -2598,7 +2608,7 @@ account.6.out_dialog_blf_enable = 0 ####################################################################################### ## BLA/SCA ## ####################################################################################### -## X ranges from 1 to 6; +## ranges from 1 to 6; ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; @@ -3022,7 +3032,6 @@ programablekey.3.label = #programablekey.4.history_type = #programablekey.4.label = - ########################################################################################## ## Expansion Module 1 ## ########################################################################################## diff --git a/resources/templates/provision/yealink/t48g/{$mac}.cfg b/resources/templates/provision/yealink/t48g/{$mac}.cfg index ad257d730b..c516e2ceea 100644 --- a/resources/templates/provision/yealink/t48g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t48g/{$mac}.cfg @@ -19,7 +19,6 @@ account.1.password = {$user_password_1} 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_proxy_enable = account.1.outbound_host = {$outbound_proxy_1} account.1.outbound_port = 5060 account.1.sip_listen_port = 5060 @@ -29,6 +28,20 @@ account.1.sip_listen_port = 5060 {if $sip_transport_1 == 'tls'}account.1.transport = 2{/if} {if $sip_transport_1 == 'dns srv'}account.1.transport = 3{/if} +account.1.outbound_proxy.1.address = {$outbound_proxy_primary_1} +account.1.outbound_proxy.2.address = {$outbound_proxy_secondary_1} +account.1.outbound_proxy_enable = {if isset($outbound_proxy_primary_1)}1{else}0{/if} + +{if isset($outbound_proxy_1_port)} +account.1.outbound_proxy.1.port = {$outbound_proxy_1_port} +{else} +account.1.outbound_proxy.1.port = 5060 +{/if} +{if isset($outbound_proxy_1_port)} +account.1.outbound_proxy.2.port = {$outbound_proxy_2_port} +{else} +account.1.outbound_proxy.2.port = 5060 +{/if} ####################################################################################### ## Failback ## @@ -318,7 +331,7 @@ account.1.dtmf.dtmf_payload = #Enable or disable to use the Distinctive Ring Tones; 0-Disabled , 1-Enabled(default); account.1.alert_info_url_enable = -#Assign a ringtone for account1. The system ring tones are: common (default), Ring1.wav, Ring2.wav,……Ring8.wav. +#Assign a ringtone for account1. The system ring tones are: common (default), Ring1.wav - Ring8.wav. #If you set the custom ring tone (Busy.wav) for the phone, the value is: account.1.ringtone.ring_type = Config:Busy.wav #If you set the system ring tone (Ring2.wav) for the phone, the value is: account.1.ringtone.ring_type = Resource:Ring2.wav account.1.ringtone.ring_type = @@ -480,7 +493,6 @@ account.2.password = {$user_password_2} 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_proxy_enable = account.2.outbound_host = {$outbound_proxy_2} account.2.outbound_port = 5060 account.2.sip_listen_port = 5060 @@ -490,6 +502,9 @@ account.2.sip_listen_port = 5060 {if $sip_transport_2 == 'tls'}account.2.transport = 2{/if} {if $sip_transport_2 == 'dns srv'}account.2.transport = 3{/if} +account.2.outbound_proxy.1.address = {$outbound_proxy_primary_2} +account.2.outbound_proxy.2.address = {$outbound_proxy_secondary_2} +account.2.outbound_proxy_enable = {if isset($outbound_proxy_primary_2)}1{else}0{/if} ####################################################################################### ## Failback ## @@ -583,7 +598,7 @@ account.2.nat.stun_server = {$stun_server} #Configure the STUN server port, the default value is 3478. account.2.nat.stun_port = {if isset($stun_port)}{$stun_port}{else}3478{/if} -#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default)，2-Option，3-Notify; +#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify; account.2.nat.udp_update_enable = 1 #Specify the keep-alive interval (in seconds), the default value is 30. @@ -775,7 +790,7 @@ account.2.dtmf.dtmf_payload = #Enable or disable to use the Distinctive Ring Tones; 0-Disabled , 1-Enabled(default); account.2.alert_info_url_enable = -#Assign a ringtone for account2. The system ring tones are: common (default), Ring1.wav, Ring2.wav,……Ring8.wav. +#Assign a ringtone for account2. The system ring tones are: common (default), Ring1.wav - Ring8.wav. #If you set the custom ring tone (Busy.wav) for the phone, the value is: account.2.ringtone.ring_type = Config:Busy.wav #If you set the system ring tone (Ring2.wav) for the phone, the value is: account.2.ringtone.ring_type = Resource:Ring2.wav account.2.ringtone.ring_type = @@ -933,7 +948,7 @@ local_time.time_zone_name = {$yealink_time_zone_name} ####################################################################################### ## NETWORK ## ####################################################################################### -##0-ipv4，1-ipv6,2-ipv4&ipv6 +##0-ipv4, 1-ipv6, 2-ipv4&ipv6 network.ip_address_mode = 2 network.ipv6_prefix = 64 @@ -974,7 +989,6 @@ account.3.password = {$user_password_3} 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_proxy_enable = account.3.outbound_host = {$outbound_proxy_3} account.3.outbound_port = 5060 account.3.sip_listen_port = 5060 @@ -984,6 +998,10 @@ account.3.sip_listen_port = 5060 {if $sip_transport_3 == 'tls'}account.3.transport = 2{/if} {if $sip_transport_3 == 'dns srv'}account.3.transport = 3{/if} +account.3.outbound_proxy.1.address = {$outbound_proxy_primary_3} +account.3.outbound_proxy.2.address = {$outbound_proxy_secondary_3} +account.3.outbound_proxy_enable = {if isset($outbound_proxy_primary_3)}1{else}0{/if} + ####################################################################################### ## Failback ## ####################################################################################### @@ -1076,7 +1094,7 @@ account.3.nat.stun_server = {$stun_server} #Configure the STUN server port, the default value is 3478. account.3.nat.stun_port = {if isset($stun_port)}{$stun_port}{else}3478{/if} -#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default)，2-Option，3-Notify; +#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify; account.3.nat.udp_update_enable = 1 #Specify the keep-alive interval (in seconds), the default value is 30. @@ -1268,7 +1286,7 @@ account.3.dtmf.dtmf_payload = #Enable or disable to use the Distinctive Ring Tones; 0-Disabled , 1-Enabled(default); account.3.alert_info_url_enable = -#Assign a ringtone for account2. The system ring tones are: common (default), Ring1.wav, Ring2.wav,……Ring8.wav. +#Assign a ringtone for account2. The system ring tones are: common (default), Ring1.wav - Ring8.wav. #If you set the custom ring tone (Busy.wav) for the phone, the value is: account.2.ringtone.ring_type = Config:Busy.wav #If you set the system ring tone (Ring2.wav) for the phone, the value is: account.2.ringtone.ring_type = Resource:Ring2.wav account.3.ringtone.ring_type = @@ -1416,7 +1434,7 @@ account.3.xsi.port = ####################################################################################### ## NETWORK ## ####################################################################################### -##0-ipv4，1-ipv6,2-ipv4&ipv6 +##0-ipv4, 1-ipv6, 2-ipv4&ipv6 network.ip_address_mode = 2 network.ipv6_prefix = 64 @@ -1456,7 +1474,6 @@ account.4.password = {$user_password_4} 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_proxy_enable = account.4.outbound_host = {$outbound_proxy_4} account.4.outbound_port = 5060 account.4.sip_listen_port = 5060 @@ -1466,6 +1483,10 @@ account.4.sip_listen_port = 5060 {if $sip_transport_4 == 'tls'}account.4.transport = 2{/if} {if $sip_transport_4 == 'dns srv'}account.4.transport = 3{/if} +account.4.outbound_proxy.1.address = {$outbound_proxy_primary_4} +account.4.outbound_proxy.2.address = {$outbound_proxy_secondary_4} +account.4.outbound_proxy_enable = {if isset($outbound_proxy_primary_4)}1{else}0{/if} + ####################################################################################### ## Failback ## ####################################################################################### @@ -1558,7 +1579,7 @@ account.4.nat.stun_server = {$stun_server} #Configure the STUN server port, the default value is 3478. account.4.nat.stun_port = {if isset($stun_port)}{$stun_port}{else}3478{/if} -#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default)，2-Option，3-Notify; +#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify; account.4.nat.udp_update_enable = 1 #Specify the keep-alive interval (in seconds), the default value is 30. @@ -1750,7 +1771,7 @@ account.4.dtmf.dtmf_payload = #Enable or disable to use the Distinctive Ring Tones; 0-Disabled , 1-Enabled(default); account.4.alert_info_url_enable = -#Assign a ringtone for account2. The system ring tones are: common (default), Ring1.wav, Ring2.wav,……Ring8.wav. +#Assign a ringtone for account2. The system ring tones are: common (default), Ring1.wav - Ring8.wav. #If you set the custom ring tone (Busy.wav) for the phone, the value is: account.2.ringtone.ring_type = Config:Busy.wav #If you set the system ring tone (Ring2.wav) for the phone, the value is: account.2.ringtone.ring_type = Resource:Ring2.wav account.4.ringtone.ring_type = @@ -1898,7 +1919,7 @@ account.4.xsi.port = ####################################################################################### ## NETWORK ## ####################################################################################### -##0-ipv4，1-ipv6,2-ipv4&ipv6 +##0-ipv4, 1-ipv6, 2-ipv4&ipv6 network.ip_address_mode = 2 network.ipv6_prefix = 64 @@ -1938,7 +1959,6 @@ account.5.password = {$user_password_5} 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_proxy_enable = account.5.outbound_host = {$outbound_proxy_5} account.5.outbound_port = 5060 account.5.sip_listen_port = 5060 @@ -1948,6 +1968,10 @@ account.5.sip_listen_port = 5060 {if $sip_transport_5 == 'tls'}account.5.transport = 2{/if} {if $sip_transport_5 == 'dns srv'}account.5.transport = 3{/if} +account.5.outbound_proxy.1.address = {$outbound_proxy_primary_5} +account.5.outbound_proxy.2.address = {$outbound_proxy_secondary_5} +account.5.outbound_proxy_enable = {if isset($outbound_proxy_primary_5)}1{else}0{/if} + ####################################################################################### ## Failback ## ####################################################################################### @@ -2040,7 +2064,7 @@ account.5.nat.stun_server = {$stun_server} #Configure the STUN server port, the default value is 3478. account.5.nat.stun_port = {if isset($stun_port)}{$stun_port}{else}3478{/if} -#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default)，2-Option，3-Notify; +#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify; account.5.nat.udp_update_enable = 1 #Specify the keep-alive interval (in seconds), the default value is 30. @@ -2232,7 +2256,7 @@ account.5.dtmf.dtmf_payload = #Enable or disable to use the Distinctive Ring Tones; 0-Disabled , 1-Enabled(default); account.5.alert_info_url_enable = -#Assign a ringtone for account2. The system ring tones are: common (default), Ring1.wav, Ring2.wav,……Ring8.wav. +#Assign a ringtone for account2. The system ring tones are: common (default), Ring1.wav - Ring8.wav. #If you set the custom ring tone (Busy.wav) for the phone, the value is: account.2.ringtone.ring_type = Config:Busy.wav #If you set the system ring tone (Ring2.wav) for the phone, the value is: account.2.ringtone.ring_type = Resource:Ring2.wav account.5.ringtone.ring_type = @@ -2380,7 +2404,7 @@ account.5.xsi.port = ####################################################################################### ## NETWORK ## ####################################################################################### -##0-ipv4，1-ipv6,2-ipv4&ipv6 +##0-ipv4, 1-ipv6, 2-ipv4&ipv6 network.ip_address_mode = 2 network.ipv6_prefix = 64 @@ -2420,7 +2444,6 @@ account.6.password = {$user_password_6} 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_proxy_enable = account.6.outbound_host = {$outbound_proxy_6} account.6.outbound_port = 5060 account.6.sip_listen_port = 5060 @@ -2430,6 +2453,10 @@ account.6.sip_listen_port = 5060 {if $sip_transport_6 == 'tls'}account.6.transport = 2{/if} {if $sip_transport_6 == 'dns srv'}account.6.transport = 3{/if} +account.6.outbound_proxy.1.address = {$outbound_proxy_primary_6} +account.6.outbound_proxy.2.address = {$outbound_proxy_secondary_6} +account.6.outbound_proxy_enable = {if isset($outbound_proxy_primary_6)}1{else}0{/if} + ####################################################################################### ## Failback ## ####################################################################################### @@ -2521,7 +2548,7 @@ account.6.nat.nat_traversal = 0 account.6.nat.stun_server = account.6.nat.stun_port = 3478 -#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default)，2-Option，3-Notify; +#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify; account.6.nat.udp_update_enable = 1 #Specify the keep-alive interval (in seconds), the default value is 30. @@ -2713,7 +2740,7 @@ account.6.dtmf.dtmf_payload = #Enable or disable to use the Distinctive Ring Tones; 0-Disabled , 1-Enabled(default); account.6.alert_info_url_enable = -#Assign a ringtone for account2. The system ring tones are: common (default), Ring1.wav, Ring2.wav,……Ring8.wav. +#Assign a ringtone for account2. The system ring tones are: common (default), Ring1.wav - Ring8.wav. #If you set the custom ring tone (Busy.wav) for the phone, the value is: account.2.ringtone.ring_type = Config:Busy.wav #If you set the system ring tone (Ring2.wav) for the phone, the value is: account.2.ringtone.ring_type = Resource:Ring2.wav account.6.ringtone.ring_type = @@ -2861,7 +2888,7 @@ account.6.xsi.port = ####################################################################################### ## NETWORK ## ####################################################################################### -##0-ipv4，1-ipv6,2-ipv4&ipv6 +##0-ipv4, 1-ipv6, 2-ipv4&ipv6 network.ip_address_mode = 2 network.ipv6_prefix = 64 @@ -2956,6 +2983,17 @@ memorykey.{$row.device_key_id}.sub_type = #The value 0 of the "proramablekey.x.line" stands for Auto, it means the first available line. #But, when the programmable key is configured as Pick Up, the value 0 stands for line 1. +{foreach $keys as $row} + {if $row.device_key_category == "programmable"} + 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} + programablekey.{$row.device_key_id}.xml_phonebook = + programablekey.{$row.device_key_id}.history_type = + programablekey.{$row.device_key_id}.label = {$row.device_key_label} + {/if} +{/foreach} + #programablekey.x.value = #programablekey.x.xml_phonebook--Specify the desired remote phonebook/local group/BSFT phonebook for the programmable key. This parameter is only appilicable to the feature XML Group/Local Group/Broadsoft Group. #programablekey.x.history_type = @@ -3006,16 +3044,26 @@ programablekey.3.label = #expansion_module.x.key.y.label = #expansion_module.X.key.Y.xml_phonebook = +{$rownum = 1} + {foreach $keys as $row} {if $row.device_key_category == "expansion"} -#Expansion module 1 key {$row.device_key_id} +{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} expansion_module.1.key.{$row.device_key_id}.value = {$row.device_key_value} expansion_module.1.key.{$row.device_key_id}.extension = {$row.device_key_extension} expansion_module.1.key.{$row.device_key_id}.label = {$row.device_key_label} expansion_module.1.key.{$row.device_key_id}.xml_phonebook = - +{else} +expansion_module.2.key.{$row.device_key_id - 40}.type = {$row.device_key_type} +expansion_module.2.key.{$row.device_key_id - 40}.line = {$row.device_key_line} +expansion_module.2.key.{$row.device_key_id - 40}.value = {$row.device_key_value} +expansion_module.2.key.{$row.device_key_id - 40}.extension = {$row.device_key_extension} +expansion_module.2.key.{$row.device_key_id - 40}.label = {$row.device_key_label} +expansion_module.2.key.{$row.device_key_id - 40}.xml_phonebook = +{/if} +{$rownum = $rownum + 1} {/if} {/foreach} diff --git a/resources/templates/provision/yealink/t49g/{$mac}.cfg b/resources/templates/provision/yealink/t49g/{$mac}.cfg index ffe8de0171..c516e2ceea 100644 --- a/resources/templates/provision/yealink/t49g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t49g/{$mac}.cfg @@ -19,7 +19,6 @@ account.1.password = {$user_password_1} 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_proxy_enable = account.1.outbound_host = {$outbound_proxy_1} account.1.outbound_port = 5060 account.1.sip_listen_port = 5060 @@ -29,6 +28,20 @@ account.1.sip_listen_port = 5060 {if $sip_transport_1 == 'tls'}account.1.transport = 2{/if} {if $sip_transport_1 == 'dns srv'}account.1.transport = 3{/if} +account.1.outbound_proxy.1.address = {$outbound_proxy_primary_1} +account.1.outbound_proxy.2.address = {$outbound_proxy_secondary_1} +account.1.outbound_proxy_enable = {if isset($outbound_proxy_primary_1)}1{else}0{/if} + +{if isset($outbound_proxy_1_port)} +account.1.outbound_proxy.1.port = {$outbound_proxy_1_port} +{else} +account.1.outbound_proxy.1.port = 5060 +{/if} +{if isset($outbound_proxy_1_port)} +account.1.outbound_proxy.2.port = {$outbound_proxy_2_port} +{else} +account.1.outbound_proxy.2.port = 5060 +{/if} ####################################################################################### ## Failback ## @@ -318,7 +331,7 @@ account.1.dtmf.dtmf_payload = #Enable or disable to use the Distinctive Ring Tones; 0-Disabled , 1-Enabled(default); account.1.alert_info_url_enable = -#Assign a ringtone for account1. The system ring tones are: common (default), Ring1.wav, Ring2.wav,……Ring8.wav. +#Assign a ringtone for account1. The system ring tones are: common (default), Ring1.wav - Ring8.wav. #If you set the custom ring tone (Busy.wav) for the phone, the value is: account.1.ringtone.ring_type = Config:Busy.wav #If you set the system ring tone (Ring2.wav) for the phone, the value is: account.1.ringtone.ring_type = Resource:Ring2.wav account.1.ringtone.ring_type = @@ -480,7 +493,6 @@ account.2.password = {$user_password_2} 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_proxy_enable = account.2.outbound_host = {$outbound_proxy_2} account.2.outbound_port = 5060 account.2.sip_listen_port = 5060 @@ -490,6 +502,9 @@ account.2.sip_listen_port = 5060 {if $sip_transport_2 == 'tls'}account.2.transport = 2{/if} {if $sip_transport_2 == 'dns srv'}account.2.transport = 3{/if} +account.2.outbound_proxy.1.address = {$outbound_proxy_primary_2} +account.2.outbound_proxy.2.address = {$outbound_proxy_secondary_2} +account.2.outbound_proxy_enable = {if isset($outbound_proxy_primary_2)}1{else}0{/if} ####################################################################################### ## Failback ## @@ -583,7 +598,7 @@ account.2.nat.stun_server = {$stun_server} #Configure the STUN server port, the default value is 3478. account.2.nat.stun_port = {if isset($stun_port)}{$stun_port}{else}3478{/if} -#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default)，2-Option，3-Notify; +#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify; account.2.nat.udp_update_enable = 1 #Specify the keep-alive interval (in seconds), the default value is 30. @@ -775,7 +790,7 @@ account.2.dtmf.dtmf_payload = #Enable or disable to use the Distinctive Ring Tones; 0-Disabled , 1-Enabled(default); account.2.alert_info_url_enable = -#Assign a ringtone for account2. The system ring tones are: common (default), Ring1.wav, Ring2.wav,……Ring8.wav. +#Assign a ringtone for account2. The system ring tones are: common (default), Ring1.wav - Ring8.wav. #If you set the custom ring tone (Busy.wav) for the phone, the value is: account.2.ringtone.ring_type = Config:Busy.wav #If you set the system ring tone (Ring2.wav) for the phone, the value is: account.2.ringtone.ring_type = Resource:Ring2.wav account.2.ringtone.ring_type = @@ -933,7 +948,7 @@ local_time.time_zone_name = {$yealink_time_zone_name} ####################################################################################### ## NETWORK ## ####################################################################################### -##0-ipv4，1-ipv6,2-ipv4&ipv6 +##0-ipv4, 1-ipv6, 2-ipv4&ipv6 network.ip_address_mode = 2 network.ipv6_prefix = 64 @@ -974,7 +989,6 @@ account.3.password = {$user_password_3} 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_proxy_enable = account.3.outbound_host = {$outbound_proxy_3} account.3.outbound_port = 5060 account.3.sip_listen_port = 5060 @@ -984,6 +998,10 @@ account.3.sip_listen_port = 5060 {if $sip_transport_3 == 'tls'}account.3.transport = 2{/if} {if $sip_transport_3 == 'dns srv'}account.3.transport = 3{/if} +account.3.outbound_proxy.1.address = {$outbound_proxy_primary_3} +account.3.outbound_proxy.2.address = {$outbound_proxy_secondary_3} +account.3.outbound_proxy_enable = {if isset($outbound_proxy_primary_3)}1{else}0{/if} + ####################################################################################### ## Failback ## ####################################################################################### @@ -1076,7 +1094,7 @@ account.3.nat.stun_server = {$stun_server} #Configure the STUN server port, the default value is 3478. account.3.nat.stun_port = {if isset($stun_port)}{$stun_port}{else}3478{/if} -#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default)，2-Option，3-Notify; +#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify; account.3.nat.udp_update_enable = 1 #Specify the keep-alive interval (in seconds), the default value is 30. @@ -1268,7 +1286,7 @@ account.3.dtmf.dtmf_payload = #Enable or disable to use the Distinctive Ring Tones; 0-Disabled , 1-Enabled(default); account.3.alert_info_url_enable = -#Assign a ringtone for account2. The system ring tones are: common (default), Ring1.wav, Ring2.wav,……Ring8.wav. +#Assign a ringtone for account2. The system ring tones are: common (default), Ring1.wav - Ring8.wav. #If you set the custom ring tone (Busy.wav) for the phone, the value is: account.2.ringtone.ring_type = Config:Busy.wav #If you set the system ring tone (Ring2.wav) for the phone, the value is: account.2.ringtone.ring_type = Resource:Ring2.wav account.3.ringtone.ring_type = @@ -1416,7 +1434,7 @@ account.3.xsi.port = ####################################################################################### ## NETWORK ## ####################################################################################### -##0-ipv4，1-ipv6,2-ipv4&ipv6 +##0-ipv4, 1-ipv6, 2-ipv4&ipv6 network.ip_address_mode = 2 network.ipv6_prefix = 64 @@ -1439,7 +1457,6 @@ 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 ## ####################################################################################### @@ -1457,7 +1474,6 @@ account.4.password = {$user_password_4} 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_proxy_enable = account.4.outbound_host = {$outbound_proxy_4} account.4.outbound_port = 5060 account.4.sip_listen_port = 5060 @@ -1467,6 +1483,10 @@ account.4.sip_listen_port = 5060 {if $sip_transport_4 == 'tls'}account.4.transport = 2{/if} {if $sip_transport_4 == 'dns srv'}account.4.transport = 3{/if} +account.4.outbound_proxy.1.address = {$outbound_proxy_primary_4} +account.4.outbound_proxy.2.address = {$outbound_proxy_secondary_4} +account.4.outbound_proxy_enable = {if isset($outbound_proxy_primary_4)}1{else}0{/if} + ####################################################################################### ## Failback ## ####################################################################################### @@ -1559,7 +1579,7 @@ account.4.nat.stun_server = {$stun_server} #Configure the STUN server port, the default value is 3478. account.4.nat.stun_port = {if isset($stun_port)}{$stun_port}{else}3478{/if} -#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default)，2-Option，3-Notify; +#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify; account.4.nat.udp_update_enable = 1 #Specify the keep-alive interval (in seconds), the default value is 30. @@ -1751,7 +1771,7 @@ account.4.dtmf.dtmf_payload = #Enable or disable to use the Distinctive Ring Tones; 0-Disabled , 1-Enabled(default); account.4.alert_info_url_enable = -#Assign a ringtone for account2. The system ring tones are: common (default), Ring1.wav, Ring2.wav,……Ring8.wav. +#Assign a ringtone for account2. The system ring tones are: common (default), Ring1.wav - Ring8.wav. #If you set the custom ring tone (Busy.wav) for the phone, the value is: account.2.ringtone.ring_type = Config:Busy.wav #If you set the system ring tone (Ring2.wav) for the phone, the value is: account.2.ringtone.ring_type = Resource:Ring2.wav account.4.ringtone.ring_type = @@ -1899,7 +1919,7 @@ account.4.xsi.port = ####################################################################################### ## NETWORK ## ####################################################################################### -##0-ipv4，1-ipv6,2-ipv4&ipv6 +##0-ipv4, 1-ipv6, 2-ipv4&ipv6 network.ip_address_mode = 2 network.ipv6_prefix = 64 @@ -1939,7 +1959,6 @@ account.5.password = {$user_password_5} 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_proxy_enable = account.5.outbound_host = {$outbound_proxy_5} account.5.outbound_port = 5060 account.5.sip_listen_port = 5060 @@ -1949,6 +1968,10 @@ account.5.sip_listen_port = 5060 {if $sip_transport_5 == 'tls'}account.5.transport = 2{/if} {if $sip_transport_5 == 'dns srv'}account.5.transport = 3{/if} +account.5.outbound_proxy.1.address = {$outbound_proxy_primary_5} +account.5.outbound_proxy.2.address = {$outbound_proxy_secondary_5} +account.5.outbound_proxy_enable = {if isset($outbound_proxy_primary_5)}1{else}0{/if} + ####################################################################################### ## Failback ## ####################################################################################### @@ -2041,7 +2064,7 @@ account.5.nat.stun_server = {$stun_server} #Configure the STUN server port, the default value is 3478. account.5.nat.stun_port = {if isset($stun_port)}{$stun_port}{else}3478{/if} -#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default)，2-Option，3-Notify; +#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify; account.5.nat.udp_update_enable = 1 #Specify the keep-alive interval (in seconds), the default value is 30. @@ -2233,7 +2256,7 @@ account.5.dtmf.dtmf_payload = #Enable or disable to use the Distinctive Ring Tones; 0-Disabled , 1-Enabled(default); account.5.alert_info_url_enable = -#Assign a ringtone for account2. The system ring tones are: common (default), Ring1.wav, Ring2.wav,……Ring8.wav. +#Assign a ringtone for account2. The system ring tones are: common (default), Ring1.wav - Ring8.wav. #If you set the custom ring tone (Busy.wav) for the phone, the value is: account.2.ringtone.ring_type = Config:Busy.wav #If you set the system ring tone (Ring2.wav) for the phone, the value is: account.2.ringtone.ring_type = Resource:Ring2.wav account.5.ringtone.ring_type = @@ -2381,7 +2404,7 @@ account.5.xsi.port = ####################################################################################### ## NETWORK ## ####################################################################################### -##0-ipv4，1-ipv6,2-ipv4&ipv6 +##0-ipv4, 1-ipv6, 2-ipv4&ipv6 network.ip_address_mode = 2 network.ipv6_prefix = 64 @@ -2421,7 +2444,6 @@ account.6.password = {$user_password_6} 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_proxy_enable = account.6.outbound_host = {$outbound_proxy_6} account.6.outbound_port = 5060 account.6.sip_listen_port = 5060 @@ -2431,6 +2453,10 @@ account.6.sip_listen_port = 5060 {if $sip_transport_6 == 'tls'}account.6.transport = 2{/if} {if $sip_transport_6 == 'dns srv'}account.6.transport = 3{/if} +account.6.outbound_proxy.1.address = {$outbound_proxy_primary_6} +account.6.outbound_proxy.2.address = {$outbound_proxy_secondary_6} +account.6.outbound_proxy_enable = {if isset($outbound_proxy_primary_6)}1{else}0{/if} + ####################################################################################### ## Failback ## ####################################################################################### @@ -2522,7 +2548,7 @@ account.6.nat.nat_traversal = 0 account.6.nat.stun_server = account.6.nat.stun_port = 3478 -#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default)，2-Option，3-Notify; +#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify; account.6.nat.udp_update_enable = 1 #Specify the keep-alive interval (in seconds), the default value is 30. @@ -2714,7 +2740,7 @@ account.6.dtmf.dtmf_payload = #Enable or disable to use the Distinctive Ring Tones; 0-Disabled , 1-Enabled(default); account.6.alert_info_url_enable = -#Assign a ringtone for account2. The system ring tones are: common (default), Ring1.wav, Ring2.wav,……Ring8.wav. +#Assign a ringtone for account2. The system ring tones are: common (default), Ring1.wav - Ring8.wav. #If you set the custom ring tone (Busy.wav) for the phone, the value is: account.2.ringtone.ring_type = Config:Busy.wav #If you set the system ring tone (Ring2.wav) for the phone, the value is: account.2.ringtone.ring_type = Resource:Ring2.wav account.6.ringtone.ring_type = @@ -2862,7 +2888,7 @@ account.6.xsi.port = ####################################################################################### ## NETWORK ## ####################################################################################### -##0-ipv4，1-ipv6,2-ipv4&ipv6 +##0-ipv4, 1-ipv6, 2-ipv4&ipv6 network.ip_address_mode = 2 network.ipv6_prefix = 64 @@ -2957,6 +2983,17 @@ memorykey.{$row.device_key_id}.sub_type = #The value 0 of the "proramablekey.x.line" stands for Auto, it means the first available line. #But, when the programmable key is configured as Pick Up, the value 0 stands for line 1. +{foreach $keys as $row} + {if $row.device_key_category == "programmable"} + 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} + programablekey.{$row.device_key_id}.xml_phonebook = + programablekey.{$row.device_key_id}.history_type = + programablekey.{$row.device_key_id}.label = {$row.device_key_label} + {/if} +{/foreach} + #programablekey.x.value = #programablekey.x.xml_phonebook--Specify the desired remote phonebook/local group/BSFT phonebook for the programmable key. This parameter is only appilicable to the feature XML Group/Local Group/Broadsoft Group. #programablekey.x.history_type = @@ -3007,16 +3044,26 @@ programablekey.3.label = #expansion_module.x.key.y.label = #expansion_module.X.key.Y.xml_phonebook = +{$rownum = 1} + {foreach $keys as $row} {if $row.device_key_category == "expansion"} -#Expansion module 1 key {$row.device_key_id} +{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} expansion_module.1.key.{$row.device_key_id}.value = {$row.device_key_value} expansion_module.1.key.{$row.device_key_id}.extension = {$row.device_key_extension} expansion_module.1.key.{$row.device_key_id}.label = {$row.device_key_label} expansion_module.1.key.{$row.device_key_id}.xml_phonebook = - +{else} +expansion_module.2.key.{$row.device_key_id - 40}.type = {$row.device_key_type} +expansion_module.2.key.{$row.device_key_id - 40}.line = {$row.device_key_line} +expansion_module.2.key.{$row.device_key_id - 40}.value = {$row.device_key_value} +expansion_module.2.key.{$row.device_key_id - 40}.extension = {$row.device_key_extension} +expansion_module.2.key.{$row.device_key_id - 40}.label = {$row.device_key_label} +expansion_module.2.key.{$row.device_key_id - 40}.xml_phonebook = +{/if} +{$rownum = $rownum + 1} {/if} {/foreach}