From 5a2a665d4cacbf8fb811836fde718fdbc6aada63 Mon Sep 17 00:00:00 2001 From: markjcrane Date: Wed, 26 Sep 2018 17:47:21 -0600 Subject: [PATCH] update the yealink templates --- .../provision/yealink/cp860/{$mac}.cfg | 6 +-- .../provision/yealink/cp920/{$mac}.cfg | 19 ++++---- .../provision/yealink/cp960/{$mac}.cfg | 3 +- .../provision/yealink/t19p/{$mac}.cfg | 24 +++++----- .../provision/yealink/t20p/{$mac}.cfg | 2 +- .../provision/yealink/t21p/{$mac}.cfg | 46 +++++++++---------- .../provision/yealink/t22p/{$mac}.cfg | 3 +- .../provision/yealink/t23g/{$mac}.cfg | 3 +- .../provision/yealink/t23p/{$mac}.cfg | 3 +- .../provision/yealink/t26p/{$mac}.cfg | 18 ++++---- .../provision/yealink/t27g/{$mac}.cfg | 19 +++++++- .../provision/yealink/t27p/{$mac}.cfg | 24 ++++++++-- .../provision/yealink/t28p/{$mac}.cfg | 13 +++--- .../provision/yealink/t29g/{$mac}.cfg | 18 ++++++++ .../provision/yealink/t32g/{$mac}.cfg | 15 +++--- .../provision/yealink/t38g/{$mac}.cfg | 23 +++++++--- .../provision/yealink/t40g/{$mac}.cfg | 36 ++++++++++++++- .../provision/yealink/t40p/{$mac}.cfg | 3 ++ .../provision/yealink/t41p/{$mac}.cfg | 2 +- .../provision/yealink/t41s/{$mac}.cfg | 46 +++++++++++++++++++ .../provision/yealink/t42g/{$mac}.cfg | 3 +- .../provision/yealink/t42s/{$mac}.cfg | 33 +++++++++++-- .../provision/yealink/t46g/{$mac}.cfg | 6 +-- .../provision/yealink/t46s/{$mac}.cfg | 5 +- .../provision/yealink/t48g/{$mac}.cfg | 24 ++++++++-- .../provision/yealink/t48s/{$mac}.cfg | 37 ++++++++++++++- .../provision/yealink/t49g/{$mac}.cfg | 35 +++++++++++++- .../provision/yealink/t52s/{$mac}.cfg | 2 +- .../provision/yealink/t56a/{$mac}.cfg | 10 ++-- .../provision/yealink/t58v/{$mac}.cfg | 10 ++-- .../provision/yealink/w52p/{$mac}.cfg | 4 +- .../provision/yealink/w56p/{$mac}.cfg | 11 +++-- 32 files changed, 376 insertions(+), 130 deletions(-) diff --git a/resources/templates/provision/yealink/cp860/{$mac}.cfg b/resources/templates/provision/yealink/cp860/{$mac}.cfg index a078a13aca..4dbd829c5c 100644 --- a/resources/templates/provision/yealink/cp860/{$mac}.cfg +++ b/resources/templates/provision/yealink/cp860/{$mac}.cfg @@ -202,8 +202,8 @@ account.1.out_dialog_blf_enable = 0 ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; -{if isset($shared_line_1) } -account.1.shared_line = {$shared_line_1} +{if isset($account.1.shared_line) } +account.1.shared_line = {$account.1.shared_line} {else} account.1.shared_line = 0 {/if} @@ -1020,7 +1020,7 @@ account.3.sip_listen_port = 5060 {if $account.3.sip_transport == 'dns srv'}account.3.transport = 3{/if} account.3.outbound_proxy.1.address = {$account.3.outbound_proxy_primary} -account.3.outbound_proxy.2.address = {$account.3.utbound_proxy_secondary} +account.3.outbound_proxy.2.address = {$account.3.outbound_proxy_secondary} account.3.outbound_proxy_enable = {if isset($account.3.outbound_proxy_primary)}1{else}0{/if} diff --git a/resources/templates/provision/yealink/cp920/{$mac}.cfg b/resources/templates/provision/yealink/cp920/{$mac}.cfg index bac106da8b..4dbd829c5c 100644 --- a/resources/templates/provision/yealink/cp920/{$mac}.cfg +++ b/resources/templates/provision/yealink/cp920/{$mac}.cfg @@ -17,11 +17,11 @@ account.1.label = {$account.1.display_name} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} -account.1.user_name = {$account.1.user_id_1} +account.1.user_name = {$account.1.user_id} account.1.sip_server_host = {$account.1.server_address} account.1.sip_server_port = {$account.1.sip_port} -account.1.outbound_host = {$outbound_proxy} +account.1.outbound_host = {$account.1.outbound_proxy} account.1.outbound_port = {$account.1.sip_port} account.1.sip_listen_port = {$account.1.sip_port} #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; @@ -202,8 +202,8 @@ account.1.out_dialog_blf_enable = 0 ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; -{if isset($shared_line_1) } -account.1.shared_line = {$shared_line_1} +{if isset($account.1.shared_line) } +account.1.shared_line = {$account.1.shared_line} {else} account.1.shared_line = 0 {/if} @@ -1019,9 +1019,9 @@ account.3.sip_listen_port = 5060 {if $account.3.sip_transport == 'tls'}account.3.transport = 2{/if} {if $account.3.sip_transport == 'dns srv'}account.3.transport = 3{/if} -account.3.outbound_proxy.1.address = {$outbound_proxy_primary} -account.3.outbound_proxy.2.address = {$outbound_proxy_secondary} -account.3.outbound_proxy_enable = {if isset($outbound_proxy_primary)}1{else}0{/if} +account.3.outbound_proxy.1.address = {$account.3.outbound_proxy_primary} +account.3.outbound_proxy.2.address = {$account.3.outbound_proxy_secondary} +account.3.outbound_proxy_enable = {if isset($account.3.outbound_proxy_primary)}1{else}0{/if} ####################################################################################### @@ -1504,6 +1504,7 @@ account.4.password = {$account.4.password} account.4.user_name = {$account.4.user_id} account.4.sip_server_host = {$account.4.server_address} account.4.sip_server_port = {$account.4.sip_port} + account.4.outbound_host = {$account.4.outbound_proxy} account.4.outbound_port = {$account.4.sip_port} account.4.sip_listen_port = 5060 @@ -1988,7 +1989,7 @@ account.5.enable = 1 {else} account.5.enable = 0 {/if} -account.5.label = {$account.5.isplay_name} +account.5.label = {$account.5.display_name} account.5.display_name = {$account.5.display_name} account.5.auth_name = {$account.5.auth_id} account.5.password = {$account.5.password} @@ -2022,7 +2023,7 @@ account.5.failback_timeout = 3600 account.5.naptr_build = 0 account.5.fallback.redundancy_type = 0 account.5.fallback.timeout = {$yealink_outbound_proxy_fallback_interval} -account.5.sip_server.1.address = {$account5.server.1.address} +account.5.sip_server.1.address = {$account.5.server.1.address} account.5.sip_server.1.port = {$account.5.sip_port} #Configure the register expiry time (in seconds), the default value is 3600. account.5.sip_server.1.expires = {$account.5.register_expires} diff --git a/resources/templates/provision/yealink/cp960/{$mac}.cfg b/resources/templates/provision/yealink/cp960/{$mac}.cfg index 26c4b3d687..da51ad1608 100644 --- a/resources/templates/provision/yealink/cp960/{$mac}.cfg +++ b/resources/templates/provision/yealink/cp960/{$mac}.cfg @@ -1504,7 +1504,6 @@ account.4.password = {$account.4.password} account.4.user_name = {$account.4.user_id} account.4.sip_server_host = {$account.4.server_address} account.4.sip_server_port = {$account.4.sip_port} - account.4.outbound_host = {$account.4.outbound_proxy} account.4.outbound_port = {$account.4.sip_port} account.4.sip_listen_port = 5060 @@ -2484,7 +2483,7 @@ account.6.enable = 0 account.6.label = {$account.6.display_name} account.6.display_name = {$account.6.display_name} account.6.auth_name = {$account.6.auth_id} -account.6.password = {$account.6.user_password} +account.6.password = {$account.6.password} account.6.user_name = {$account.6.user_id} account.6.sip_server_host = {$account.6.server_address} account.6.sip_server_port = {$account.6.sip_port} diff --git a/resources/templates/provision/yealink/t19p/{$mac}.cfg b/resources/templates/provision/yealink/t19p/{$mac}.cfg index d6d8bc78f4..1df2c85d57 100644 --- a/resources/templates/provision/yealink/t19p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t19p/{$mac}.cfg @@ -256,7 +256,7 @@ account.1.advanced.timer_t1 = account.1.advanced.timer_t2 = account.1.advanced.timer_t4 = -#Assign a ringtone for account 1. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav,����Ring8.wav. +#Assign a ringtone for account 1. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav, Ring8.wav. #If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav #If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav account.1.ringtone.ring_type = @@ -386,8 +386,6 @@ account.2.outbound_port = {$account.2.sip_port} account.2.outbound_proxy.1.address = {$account.2.outbound_proxy_primary} account.2.outbound_proxy.2.address = {$account.2.outbound_proxy_secondary} account.2.outbound_proxy_enable = {if isset($account.2.outbound_proxy_primary)}1{else}0{/if} - - #Configure the address of the backup outbound proxy server. account.2.backup_outbound_host = @@ -579,7 +577,7 @@ account.2.advanced.timer_t1 = account.2.advanced.timer_t2 = account.2.advanced.timer_t4 = -#Assign a ringtone for account 2. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav,����Ring8.wav. +#Assign a ringtone for account 2. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav, Ring8.wav. #If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav #If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav account.2.ringtone.ring_type = @@ -676,7 +674,7 @@ account.3.label = {$account.3.display_name} account.3.display_name = {$account.3.display_name} #Configure the username and password for register authentication. -account.3.auth_name = {$account.3.auth_id_} +account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} #Configure the register user name. @@ -900,7 +898,7 @@ account.3.advanced.timer_t1 = account.3.advanced.timer_t2 = account.3.advanced.timer_t4 = -#Assign a ringtone for account 3. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav,����Ring8.wav. +#Assign a ringtone for account 3. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav, Ring8.wav. #If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav #If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav account.3.ringtone.ring_type = @@ -1031,6 +1029,7 @@ account.4.outbound_proxy.1.address = {$account.4.outbound_proxy_primary} account.4.outbound_proxy.2.address = {$account.4.outbound_proxy_secondary} account.4.outbound_proxy_enable = {if isset($account.4.outbound_proxy_primary)}1{else}0{/if} + #Configure the address of the backup outbound proxy server. account.4.backup_outbound_host = @@ -1221,7 +1220,7 @@ account.4.advanced.timer_t1 = account.4.advanced.timer_t2 = account.4.advanced.timer_t4 = -#Assign a ringtone for account 4. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav,����Ring8.wav. +#Assign a ringtone for account 4. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav, Ring8.wav. #If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav #If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav account.4.ringtone.ring_type = @@ -1543,7 +1542,7 @@ account.5.advanced.timer_t1 = account.5.advanced.timer_t2 = account.5.advanced.timer_t4 = -#Assign a ringtone for account 5. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav,����Ring8.wav. +#Assign a ringtone for account 5. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav, Ring8.wav. #If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav #If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav account.5.ringtone.ring_type = @@ -1641,7 +1640,7 @@ account.6.display_name = {$account.6.display_name} #Configure the username and password for register authentication. account.6.auth_name = {$account.6.auth_id} -account.6.password = {account.6.$user_id} +account.6.password = {$account.6.user_id} #Configure the register user name. account.6.user_name = {$account.6.user_id} @@ -1727,7 +1726,7 @@ account.6.subscribe_register = account.6.subscribe_mwi = 0 #Configure MWI subscribe expiry time (in seconds). It ranges from 0 to 84600, the default value is 3600. -account.6.subscribe_mwi_expires = +account.6.subscribe_mwi_expires = 3600 #Configure the type of SIP header(s) to carry the caller ID; 0-FROM (default), 1-PAI 2-PAI-FROM, 3-PRID-PAI-FROM, 4-PAI-RPID-FROM, 5-RPID-FROM; account.6.cid_source = {$yealink_cid_source} @@ -1806,7 +1805,7 @@ account.6.blf_list_barge_in_code = account.6.blf.subscribe_period = #Configure the ACD subscribe period (in seconds). It ranges from 120 to 3600 (default). -account.6.subscribe_acd_expires = +account.6.subscribe_acd_expires = 3600 #Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom; account.6.sip_server_type = @@ -1862,7 +1861,7 @@ account.6.advanced.timer_t1 = account.6.advanced.timer_t2 = account.6.advanced.timer_t4 = -#Assign a ringtone for account 6. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav,����Ring8.wav. +#Assign a ringtone for account 6. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav, Ring8.wav. #If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav #If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav account.6.ringtone.ring_type = @@ -1980,7 +1979,6 @@ forward.international.enable = #The default value equals to the value of x. For example, the default value of the parameter "linekey.1.line" is 1. #linekey.x.lable--Define the label for each line key. - {foreach $keys['line'] as $row} #Configure Line Key {$row.device_key_id} diff --git a/resources/templates/provision/yealink/t20p/{$mac}.cfg b/resources/templates/provision/yealink/t20p/{$mac}.cfg index 04c0f6ccb0..9874e5d850 100644 --- a/resources/templates/provision/yealink/t20p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t20p/{$mac}.cfg @@ -1353,7 +1353,7 @@ account.5.outbound_port = {$account.5.sip_port} account.5.outbound_proxy.1.address = {$account.5.outbound_proxy_primary} account.5.outbound_proxy.2.address = {$account.5.outbound_proxy_secondary} -account.5.outbound_proxy_enable = {if isset($account.5.outbound_proxy_primary}1{else}0{/if} +account.5.outbound_proxy_enable = {if isset($account.5.outbound_proxy_primary)}1{else}0{/if} #Configure the address of the backup outbound proxy server. account.5.backup_outbound_host = diff --git a/resources/templates/provision/yealink/t21p/{$mac}.cfg b/resources/templates/provision/yealink/t21p/{$mac}.cfg index 24a3af2ece..06c47a920f 100644 --- a/resources/templates/provision/yealink/t21p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t21p/{$mac}.cfg @@ -23,7 +23,8 @@ account.1.sip_server_port = {$account.1.sip_port} account.1.outbound_host = {$account.1.outbound_proxy} account.1.outbound_port = {$account.1.sip_port} -account.1.sip_listen_port = {$account.1.sip_port} +{if isset($yealink_sip_listen_port)}account.1.sip_listen_port = {$yealink_sip_listen_port}{else}account.1.sip_listen_port = 5060{/if} + #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $account.1.sip_transport == 'udp'}account.1.transport = 0{/if} {if $account.1.sip_transport == 'tcp'}account.1.transport = 1{/if} @@ -45,7 +46,6 @@ account.1.outbound_proxy.2.port = {$outbound_proxy_2_port} account.1.outbound_proxy.2.port = {$account.1.sip_port} {/if} - ####################################################################################### ## Failback ## ####################################################################################### @@ -398,7 +398,7 @@ account.1.100rel_enable = {$yealink_retransmission} #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; account.1.enable_user_equal_phone = -#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default); +#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default); account.1.compact_header_enable = ####################################################################################### @@ -498,7 +498,6 @@ account.2.password = {$account.2.password} account.2.user_name = {$account.2.user_id} account.2.sip_server_host = {$account.2.server_address} account.2.sip_server_port = {$account.2.sip_port} - account.2.outbound_host = {$account.2.outbound_proxy} account.2.outbound_port = {$account.2.sip_port} account.2.sip_listen_port = 5060 @@ -864,7 +863,7 @@ account.2.100rel_enable = {$yealink_retransmission} #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; account.2.enable_user_equal_phone = -#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default); +#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default); account.2.compact_header_enable = ####################################################################################### @@ -1008,7 +1007,6 @@ account.3.password = {$account.3.password} account.3.user_name = {$account.3.user_id} account.3.sip_server_host = {$account.3.server_address} account.3.sip_server_port = {$account.3.sip_port} - account.3.outbound_host = {$account.3.outbound_proxy} account.3.outbound_port = {$account.3.sip_port} account.3.sip_listen_port = 5060 @@ -1374,7 +1372,7 @@ account.3.100rel_enable = {$yealink_retransmission} #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; account.3.enable_user_equal_phone = -#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default); +#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default); account.3.compact_header_enable = ####################################################################################### @@ -1483,7 +1481,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 ## ####################################################################################### @@ -1501,7 +1498,6 @@ account.4.password = {$account.4.password} account.4.user_name = {$account.4.user_id} account.4.sip_server_host = {$account.4.server_address} account.4.sip_server_port = {$account.4.sip_port} - account.4.outbound_host = {$account.4.outbound_proxy} account.4.outbound_port = {$account.4.sip_port} account.4.sip_listen_port = 5060 @@ -1867,7 +1863,7 @@ account.4.100rel_enable = {$yealink_retransmission} #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; account.4.enable_user_equal_phone = -#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default); +#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default); account.4.compact_header_enable = ####################################################################################### @@ -1993,7 +1989,6 @@ account.5.password = {$account.5.password} account.5.user_name = {$account.5.user_id} account.5.sip_server_host = {$account.5.server_address} account.5.sip_server_port = {$account.5.sip_port} - account.5.outbound_host = {$account.5.outbound_proxy} account.5.outbound_port = {$account.5.sip_port} account.5.sip_listen_port = 5060 @@ -2359,7 +2354,7 @@ account.5.100rel_enable = {$yealink_retransmission} #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; account.5.enable_user_equal_phone = -#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default); +#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default); account.5.compact_header_enable = ####################################################################################### @@ -2485,7 +2480,6 @@ account.6.password = {$account.6.password} account.6.user_name = {$account.6.user_id} account.6.sip_server_host = {$account.6.server_address} account.6.sip_server_port = {$account.6.sip_port} - account.6.outbound_host = {$account.6.outbound_proxy} account.6.outbound_port = {$account.6.sip_port} account.6.sip_listen_port = 5060 @@ -2850,7 +2844,7 @@ account.6.100rel_enable = {$yealink_retransmission} #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled; account.6.enable_user_equal_phone = -#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default); +#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default); account.6.compact_header_enable = ####################################################################################### @@ -2968,7 +2962,6 @@ network.internet_port.gateway = #The default value equals to the value of x. For example, the default value of the parameter "linekey.1.line" is 1. #linekey.x.lable--Define the label for each line key. Meet-Me Conference "1" or BLF "16" require pick_value. - {foreach $keys['line'] as $row} #Configure Line Key {$row.device_key_id} @@ -2983,7 +2976,6 @@ linekey.{$row.device_key_id}.type = {$row.device_key_type} linekey.{$row.device_key_id}.xml_phonebook = linekey.{$row.device_key_id}.label = {$row.device_key_label} - {/foreach} @@ -3015,7 +3007,6 @@ memorykey.{$row.device_key_id}.label = {$row.device_key_label} memorykey.{$row.device_key_id}.xml_phonebook = memorykey.{$row.device_key_id}.sub_type = - {/foreach} @@ -3030,22 +3021,17 @@ memorykey.{$row.device_key_id}.sub_type = #expansion_module.x.key.y.label = #expansion_module.X.key.Y.xml_phonebook = -{$rownum = 1} - -{foreach $keys["expansion"] as $row} - -{if $rownum <= 40} -#Expansion module 1 key {$row.device_key_id} +{foreach $keys["expansion-1"] as $row} 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 = -{/if} {/foreach} + ########################################################################################## ## Expansion Module 2 ## ########################################################################################## @@ -3058,4 +3044,14 @@ expansion_module.1.key.{$row.device_key_id}.xml_phonebook = #expansion_module.2.key.1.label = #expansion_module.2.key.1.xml_phonebook = #expansion_module.2.key.1.type = -#expansion_module.2.key.1.label = +#expansion_module.2.key.1.label = + +{foreach $keys["expansion-2"] as $row} +expansion_module.2.key.{$row.device_key_id}.type = {$row.device_key_type} +expansion_module.2.key.{$row.device_key_id}.line = {$row.device_key_line} +expansion_module.2.key.{$row.device_key_id}.value = {$row.device_key_value} +expansion_module.2.key.{$row.device_key_id}.extension = {$row.device_key_extension} +expansion_module.2.key.{$row.device_key_id}.label = {$row.device_key_label} +expansion_module.2.key.{$row.device_key_id}.xml_phonebook = + +{/foreach} diff --git a/resources/templates/provision/yealink/t22p/{$mac}.cfg b/resources/templates/provision/yealink/t22p/{$mac}.cfg index 843325ebb5..1df2c85d57 100644 --- a/resources/templates/provision/yealink/t22p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t22p/{$mac}.cfg @@ -66,7 +66,6 @@ account.1.outbound_proxy.2.port = {$outbound_proxy_2_port} account.1.outbound_proxy.2.port = {$account.1.sip_port} {/if} - #Configure the address of the backup outbound proxy server. account.1.backup_outbound_host = @@ -373,7 +372,7 @@ account.2.sip_server_port = {$account.2.sip_port} #Specify the IP address or domain name of the outbound proxy server. -account.2.outbound_host = {$account.2.outbound_proxy_2} +account.2.outbound_host = {$account.2.outbound_proxy} #Specify the server port, the default value is 5060. account.2.outbound_port = {$account.2.sip_port} diff --git a/resources/templates/provision/yealink/t23g/{$mac}.cfg b/resources/templates/provision/yealink/t23g/{$mac}.cfg index 1944536ad4..3e470f2680 100644 --- a/resources/templates/provision/yealink/t23g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t23g/{$mac}.cfg @@ -23,6 +23,7 @@ account.1.sip_server_port = {$account.1.sip_port} account.1.outbound_host = {$account.1.outbound_proxy} account.1.outbound_port = {$account.1.sip_port} {if isset($yealink_sip_listen_port)}account.1.sip_listen_port = {$yealink_sip_listen_port}{else}account.1.sip_listen_port = 5060{/if} + #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $account.1.sip_transport == 'udp'}account.1.transport = 0{/if} {if $account.1.sip_transport == 'tcp'}account.1.transport = 1{/if} @@ -2401,7 +2402,7 @@ account.6.outbound_port = {$account.6.sip_port} account.6.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; -{if $account.6.account.6.sip_transport == 'udp'}account.6.transport = 0{/if} +{if $account.6.sip_transport == 'udp'}account.6.transport = 0{/if} {if $account.6.sip_transport == 'tcp'}account.6.transport = 1{/if} {if $account.6.sip_transport == 'tls'}account.6.transport = 2{/if} {if $account.6.sip_transport == 'dns srv'}account.6.transport = 3{/if} diff --git a/resources/templates/provision/yealink/t23p/{$mac}.cfg b/resources/templates/provision/yealink/t23p/{$mac}.cfg index d574436526..3e470f2680 100644 --- a/resources/templates/provision/yealink/t23p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t23p/{$mac}.cfg @@ -1465,7 +1465,7 @@ account.4.sip_listen_port = 5060 account.4.outbound_proxy.1.address = {$account.4.outbound_proxy_primary} account.4.outbound_proxy.2.address = {$account.4.outbound_proxy_secondary} -account.4.outbound_proxy_enable = {if isset($account.4.outbound_proxy_primary}1{else}0{/if} +account.4.outbound_proxy_enable = {if isset($account.4.outbound_proxy_primary)}1{else}0{/if} ####################################################################################### ## Failback ## @@ -2902,7 +2902,6 @@ memorykey.{$row.device_key_id}.sub_type = {/foreach} - ########################################################################################## ## Expansion Module 1 ## ########################################################################################## diff --git a/resources/templates/provision/yealink/t26p/{$mac}.cfg b/resources/templates/provision/yealink/t26p/{$mac}.cfg index 5829b6d0c0..cf223c0136 100644 --- a/resources/templates/provision/yealink/t26p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t26p/{$mac}.cfg @@ -104,7 +104,7 @@ account.1.anonymous_reject_offcode = account.1.sip_listen_port = #Configure the register expiry time (in seconds), the default value is 3600. -account.1.expires = {$register_expires_1} +account.1.expires = {$account.1.register_expires} #Enable or disable the 100 reliable retransmission; 0-Disabled, 1-Enabled (default); account.1.100rel_enable = {$yealink_retransmission} @@ -256,7 +256,7 @@ account.1.advanced.timer_t1 = account.1.advanced.timer_t2 = account.1.advanced.timer_t4 = -#Assign a ringtone for account 1. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav,����Ring8.wav. +#Assign a ringtone for account 1. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav,Ring8.wav. #If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav #If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav account.1.ringtone.ring_type = @@ -387,7 +387,6 @@ account.2.outbound_proxy.1.address = {$account.2.outbound_proxy_primary} account.2.outbound_proxy.2.address = {$account.2.outbound_proxy_secondary} account.2.outbound_proxy_enable = {if isset($account.2.outbound_proxy_primary)}1{else}0{/if} - #Configure the address of the backup outbound proxy server. account.2.backup_outbound_host = @@ -578,7 +577,7 @@ account.2.advanced.timer_t1 = account.2.advanced.timer_t2 = account.2.advanced.timer_t4 = -#Assign a ringtone for account 2. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav,����Ring8.wav. +#Assign a ringtone for account 2. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav, Ring8.wav. #If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav #If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav account.2.ringtone.ring_type = @@ -709,6 +708,7 @@ account.3.outbound_proxy.1.address = {$account.3.outbound_proxy_primary} account.3.outbound_proxy.2.address = {$account.3.outbound_proxy_secondary} account.3.outbound_proxy_enable = {if isset($account.3.outbound_proxy_primary)}1{else}0{/if} + #Configure the address of the backup outbound proxy server. account.3.backup_outbound_host = @@ -899,7 +899,7 @@ account.3.advanced.timer_t1 = account.3.advanced.timer_t2 = account.3.advanced.timer_t4 = -#Assign a ringtone for account 3. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav,����Ring8.wav. +#Assign a ringtone for account 3. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav, Ring8.wav. #If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav #If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav account.3.ringtone.ring_type = @@ -1220,7 +1220,7 @@ account.4.advanced.timer_t1 = account.4.advanced.timer_t2 = account.4.advanced.timer_t4 = -#Assign a ringtone for account 4. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav,����Ring8.wav. +#Assign a ringtone for account 4. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav, Ring8.wav. #If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav #If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav account.4.ringtone.ring_type = @@ -1542,7 +1542,7 @@ account.5.advanced.timer_t1 = account.5.advanced.timer_t2 = account.5.advanced.timer_t4 = -#Assign a ringtone for account 5. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav,����Ring8.wav. +#Assign a ringtone for account 5. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav, Ring8.wav. #If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav #If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav account.5.ringtone.ring_type = @@ -1661,7 +1661,7 @@ account.6.sip_server_port = {$account.6.sip_port} account.6.outbound_host = {$account.6.outbound_proxy} #Specify the server port, the default value is 5060. -account.6.outbound_port = +account.6.outbound_port = {$account.6.sip_port} #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $account.6.sip_transport == 'udp'}account.6.transport = 0{/if} @@ -1861,7 +1861,7 @@ account.6.advanced.timer_t1 = account.6.advanced.timer_t2 = account.6.advanced.timer_t4 = -#Assign a ringtone for account 6. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav,����Ring8.wav. +#Assign a ringtone for account 6. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav, Ring8.wav. #If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav #If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav account.6.ringtone.ring_type = diff --git a/resources/templates/provision/yealink/t27g/{$mac}.cfg b/resources/templates/provision/yealink/t27g/{$mac}.cfg index 2ce21937fc..049ec5edcc 100644 --- a/resources/templates/provision/yealink/t27g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t27g/{$mac}.cfg @@ -17,7 +17,11 @@ account.1.label = {$account.1.display_name} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} +{if isset($account.1.server.1.address)} +account.1.user_name = {$account.1.user_id}@{$account.1.server_address} +{else} account.1.user_name = {$account.1.user_id} +{/if} account.1.sip_server_host = {$account.1.server_address} account.1.sip_server_port = {$account.1.sip_port} account.1.outbound_host = {$account.1.outbound_proxy} @@ -60,6 +64,13 @@ account.1.fallback.redundancy_type = 0 account.1.fallback.timeout = {$yealink_outbound_proxy_fallback_interval} account.1.sip_server.1.address = {$account.1.server.1.address} account.1.sip_server.1.port = {$account.1.sip_port} + +#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR; +{if $account.1.sip_transport == 'udp'}account.1.sip_server.1.transport_type = 0{/if} +{if $account.1.sip_transport == 'tcp'}account.1.sip_server.1.transport_type = 1{/if} +{if $account.1.sip_transport == 'tls'}account.1.sip_server.1.transport_type = 2{/if} +{if $account.1.sip_transport == 'dns srv'}account.1.sip_server.1.transport_type = 3{/if} + #Configure the register expiry time (in seconds), the default value is 3600. account.1.sip_server.1.expires = {$account.1.register_expires} account.1.sip_server.1.retry_counts = 3 @@ -68,6 +79,13 @@ account.1.sip_server.1.failback_timeout = 3600 account.1.sip_server.1.register_on_enable = 0 account.1.sip_server.2.address = {$account.1.server.2.address} account.1.sip_server.2.port = {$account.1.sip_port} + +#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR; +{if $account.1.sip_transport == 'udp'}account.1.sip_server.2.transport_type = 0{/if} +{if $account.1.sip_transport == 'tcp'}account.1.sip_server.2.transport_type = 1{/if} +{if $account.1.sip_transport == 'tls'}account.1.sip_server.2.transport_type = 2{/if} +{if $account.1.sip_transport == 'dns srv'}account.1.sip_server.2.transport_type = 3{/if} + account.1.sip_server.2.expires = {$account.1.register_expires} account.1.sip_server.2.retry_counts = 3 account.1.sip_server.2.failback_mode = 0 @@ -2903,7 +2921,6 @@ memorykey.{$row.device_key_id}.sub_type = {/foreach} - ########################################################################################## ## Expansion Module 1 ## ########################################################################################## diff --git a/resources/templates/provision/yealink/t27p/{$mac}.cfg b/resources/templates/provision/yealink/t27p/{$mac}.cfg index 0cebe8218e..dbe8b4556c 100644 --- a/resources/templates/provision/yealink/t27p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t27p/{$mac}.cfg @@ -17,7 +17,11 @@ account.1.label = {$account.1.display_name} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} +{if isset($account.1.server.1.address)} +account.1.user_name = {$account.1.user_id}@{$account.1.server_address} +{else} account.1.user_name = {$account.1.user_id} +{/if} account.1.sip_server_host = {$account.1.server_address} account.1.sip_server_port = {$account.1.sip_port} account.1.outbound_host = {$account.1.outbound_proxy} @@ -31,8 +35,8 @@ account.1.outbound_port = {$account.1.sip_port} {if $account.1.sip_transport == 'dns srv'}account.1.transport = 3{/if} account.1.outbound_proxy.1.address = {$account.1.outbound_proxy_primary} -account.1.outbound_proxy.2.address = {$account.1.account.1.outbound_proxy_secondary} -account.1.outbound_proxy_enable = {if isset($account.1.outbound_proxy_primary}1{else}0{/if} +account.1.outbound_proxy.2.address = {$account.1.outbound_proxy_secondary} +account.1.outbound_proxy_enable = {if isset($account.1.outbound_proxy_primary)}1{else}0{/if} {if isset($outbound_proxy_1_port)} account.1.outbound_proxy.1.port = {$outbound_proxy_1_port} @@ -60,14 +64,28 @@ account.1.fallback.redundancy_type = 0 account.1.fallback.timeout = {$yealink_outbound_proxy_fallback_interval} account.1.sip_server.1.address = {$account.1.server.1.address} account.1.sip_server.1.port = {$account.1.sip_port} + +#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR; +{if $account.1.sip_transport == 'udp'}account.1.sip_server.1.transport_type = 0{/if} +{if $account.1.sip_transport == 'tcp'}account.1.sip_server.1.transport_type = 1{/if} +{if $account.1.sip_transport == 'tls'}account.1.sip_server.1.transport_type = 2{/if} +{if $account.1.sip_transport == 'dns srv'}account.1.sip_server.1.transport_type = 3{/if} + #Configure the register expiry time (in seconds), the default value is 3600. account.1.sip_server.1.expires = {$account.1.register_expires} account.1.sip_server.1.retry_counts = 3 account.1.sip_server.1.failback_mode = 0 account.1.sip_server.1.failback_timeout = 3600 account.1.sip_server.1.register_on_enable = 0 -account.1.sip_server.2.address = {$account.1.server.2.address +account.1.sip_server.2.address = {$account.1.server.2.address} account.1.sip_server.2.port = {$account.1.sip_port} + +#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR; +{if $account.1.sip_transport == 'udp'}account.1.sip_server.2.transport_type = 0{/if} +{if $account.1.sip_transport == 'tcp'}account.1.sip_server.2.transport_type = 1{/if} +{if $account.1.sip_transport == 'tls'}account.1.sip_server.2.transport_type = 2{/if} +{if $account.1.sip_transport == 'dns srv'}account.1.sip_server.2.transport_type = 3{/if} + account.1.sip_server.2.expires = {$account.1.register_expires} account.1.sip_server.2.retry_counts = 3 account.1.sip_server.2.failback_mode = 0 diff --git a/resources/templates/provision/yealink/t28p/{$mac}.cfg b/resources/templates/provision/yealink/t28p/{$mac}.cfg index 495903a912..cf223c0136 100644 --- a/resources/templates/provision/yealink/t28p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t28p/{$mac}.cfg @@ -66,7 +66,6 @@ account.1.outbound_proxy.2.port = {$outbound_proxy_2_port} account.1.outbound_proxy.2.port = {$account.1.sip_port} {/if} - #Configure the address of the backup outbound proxy server. account.1.backup_outbound_host = @@ -257,7 +256,7 @@ account.1.advanced.timer_t1 = account.1.advanced.timer_t2 = account.1.advanced.timer_t4 = -#Assign a ringtone for account 1. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav,¡­¡­Ring8.wav. +#Assign a ringtone for account 1. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav,Ring8.wav. #If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav #If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav account.1.ringtone.ring_type = @@ -578,7 +577,7 @@ account.2.advanced.timer_t1 = account.2.advanced.timer_t2 = account.2.advanced.timer_t4 = -#Assign a ringtone for account 2. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav,¡­¡­Ring8.wav. +#Assign a ringtone for account 2. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav, Ring8.wav. #If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav #If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav account.2.ringtone.ring_type = @@ -900,7 +899,7 @@ account.3.advanced.timer_t1 = account.3.advanced.timer_t2 = account.3.advanced.timer_t4 = -#Assign a ringtone for account 3. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav,¡­¡­Ring8.wav. +#Assign a ringtone for account 3. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav, Ring8.wav. #If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav #If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav account.3.ringtone.ring_type = @@ -1221,7 +1220,7 @@ account.4.advanced.timer_t1 = account.4.advanced.timer_t2 = account.4.advanced.timer_t4 = -#Assign a ringtone for account 4. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav,¡­¡­Ring8.wav. +#Assign a ringtone for account 4. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav, Ring8.wav. #If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav #If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav account.4.ringtone.ring_type = @@ -1543,7 +1542,7 @@ account.5.advanced.timer_t1 = account.5.advanced.timer_t2 = account.5.advanced.timer_t4 = -#Assign a ringtone for account 5. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav,¡­¡­Ring8.wav. +#Assign a ringtone for account 5. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav, Ring8.wav. #If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav #If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav account.5.ringtone.ring_type = @@ -1862,7 +1861,7 @@ account.6.advanced.timer_t1 = account.6.advanced.timer_t2 = account.6.advanced.timer_t4 = -#Assign a ringtone for account 6. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav,¡­¡­Ring8.wav. +#Assign a ringtone for account 6. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav, Ring8.wav. #If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav #If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav account.6.ringtone.ring_type = diff --git a/resources/templates/provision/yealink/t29g/{$mac}.cfg b/resources/templates/provision/yealink/t29g/{$mac}.cfg index 18a1a5a7a1..dbe8b4556c 100644 --- a/resources/templates/provision/yealink/t29g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t29g/{$mac}.cfg @@ -17,7 +17,11 @@ account.1.label = {$account.1.display_name} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} +{if isset($account.1.server.1.address)} +account.1.user_name = {$account.1.user_id}@{$account.1.server_address} +{else} account.1.user_name = {$account.1.user_id} +{/if} account.1.sip_server_host = {$account.1.server_address} account.1.sip_server_port = {$account.1.sip_port} account.1.outbound_host = {$account.1.outbound_proxy} @@ -60,6 +64,13 @@ account.1.fallback.redundancy_type = 0 account.1.fallback.timeout = {$yealink_outbound_proxy_fallback_interval} account.1.sip_server.1.address = {$account.1.server.1.address} account.1.sip_server.1.port = {$account.1.sip_port} + +#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR; +{if $account.1.sip_transport == 'udp'}account.1.sip_server.1.transport_type = 0{/if} +{if $account.1.sip_transport == 'tcp'}account.1.sip_server.1.transport_type = 1{/if} +{if $account.1.sip_transport == 'tls'}account.1.sip_server.1.transport_type = 2{/if} +{if $account.1.sip_transport == 'dns srv'}account.1.sip_server.1.transport_type = 3{/if} + #Configure the register expiry time (in seconds), the default value is 3600. account.1.sip_server.1.expires = {$account.1.register_expires} account.1.sip_server.1.retry_counts = 3 @@ -68,6 +79,13 @@ account.1.sip_server.1.failback_timeout = 3600 account.1.sip_server.1.register_on_enable = 0 account.1.sip_server.2.address = {$account.1.server.2.address} account.1.sip_server.2.port = {$account.1.sip_port} + +#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR; +{if $account.1.sip_transport == 'udp'}account.1.sip_server.2.transport_type = 0{/if} +{if $account.1.sip_transport == 'tcp'}account.1.sip_server.2.transport_type = 1{/if} +{if $account.1.sip_transport == 'tls'}account.1.sip_server.2.transport_type = 2{/if} +{if $account.1.sip_transport == 'dns srv'}account.1.sip_server.2.transport_type = 3{/if} + account.1.sip_server.2.expires = {$account.1.register_expires} account.1.sip_server.2.retry_counts = 3 account.1.sip_server.2.failback_mode = 0 diff --git a/resources/templates/provision/yealink/t32g/{$mac}.cfg b/resources/templates/provision/yealink/t32g/{$mac}.cfg index 0eeb7bfa29..3b1aa0cfb3 100644 --- a/resources/templates/provision/yealink/t32g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t32g/{$mac}.cfg @@ -1,4 +1,5 @@ #!version:1.0.0.1 +#{$microtime} ##File header "#!version:1.0.0.1" can not be edited or deleted.## @@ -36,7 +37,7 @@ account.1.sip_server_host = {$account.1.server_address} account.1.sip_server_port = {$account.1.sip_port} #Enable or disable the use of the outbound proxy server; 0-Disabled (default), 1-Enabled; -account.1.outbound_proxy_enable = {if isset($outbound_proxy_primary_1)}1{else}0{/if} +account.1.outbound_proxy_enable = {if isset($account.1.outbound_proxy_primary)}1{else}0{/if} #Specify the IP address or domain name of the outbound proxy server. account.1.outbound_host = {$account.1.outbound_proxy_primary} @@ -53,11 +54,11 @@ account.1.outbound_port = {$account.1.sip_port} #Configure the address of the backup outbound proxy server. -account.1.backup_outbound_host = {$outbound_proxy_secondary_1} +account.1.backup_outbound_host = {$account.1.outbound_proxy_secondary} #Specify the port of the backup outbound proxy server, the default value is 5060. {if isset($outbound_proxy_1_port)} -account.1.backup_outbound_port = $outbound_proxy_secondary_1 +account.1.backup_outbound_port = $account.1.outbound_proxy_secondary {else} account.1.backup_outbound_port = {$account.1.sip_port} {/if} @@ -246,7 +247,7 @@ account.1.advanced.timer_t1 = account.1.advanced.timer_t2 = account.1.advanced.timer_t4 = -#Assign a ringtone for account 1. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav - �Ring8.wav. +#Assign a ringtone for account 1. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav - ­Ring8.wav. #If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav #If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav account.1.ringtone.ring_type = @@ -872,7 +873,7 @@ account.3.advanced.timer_t1 = account.3.advanced.timer_t2 = account.3.advanced.timer_t4 = -#Assign a ringtone for account 3. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav - �Ring8.wav. +#Assign a ringtone for account 3. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav - ­Ring8.wav. #If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav #If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav account.3.ringtone.ring_type = @@ -1810,7 +1811,7 @@ account.6.advanced.timer_t1 = account.6.advanced.timer_t2 = account.6.advanced.timer_t4 = -#Assign a ringtone for account 6. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav - �Ring8.wav. +#Assign a ringtone for account 6. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav - ­Ring8.wav. #If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav #If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav account.6.ringtone.ring_type = @@ -1967,7 +1968,7 @@ linekey.{$row.device_key_id}.label = {$row.device_key_label} memorykey.{$row.device_key_id}.type = {$row.device_key_type} memorykey.{$row.device_key_id}.line = {$row.device_key_line} memorykey.{$row.device_key_id}.value = {$row.device_key_value} -{if $row.device_key_category == "blf"} +{if $row.device_key_type == "blf"} memorykey.{$row.device_key_id}.pickup_value = {$row.device_key_extension} {/if} memorykey.{$row.device_key_id}.label = {$row.device_key_label} diff --git a/resources/templates/provision/yealink/t38g/{$mac}.cfg b/resources/templates/provision/yealink/t38g/{$mac}.cfg index f4711b4861..3b1aa0cfb3 100644 --- a/resources/templates/provision/yealink/t38g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t38g/{$mac}.cfg @@ -37,13 +37,14 @@ account.1.sip_server_host = {$account.1.server_address} account.1.sip_server_port = {$account.1.sip_port} #Enable or disable the use of the outbound proxy server; 0-Disabled (default), 1-Enabled; -account.1.outbound_proxy_enable = +account.1.outbound_proxy_enable = {if isset($account.1.outbound_proxy_primary)}1{else}0{/if} #Specify the IP address or domain name of the outbound proxy server. -account.1.outbound_host = {$account.1.outbound_proxy} +account.1.outbound_host = {$account.1.outbound_proxy_primary} #Specify the server port, the default value is 5060. -account.1.outbound_port = +account.1.outbound_port = {$account.1.sip_port} +{if isset($yealink_sip_listen_port)}account.1.sip_listen_port = {$yealink_sip_listen_port}{else}account.1.sip_listen_port = 5060{/if} #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $account.1.sip_transport == 'udp'}account.1.transport = 0{/if} @@ -53,10 +54,14 @@ account.1.outbound_port = #Configure the address of the backup outbound proxy server. -account.1.backup_outbound_host = +account.1.backup_outbound_host = {$account.1.outbound_proxy_secondary} #Specify the port of the backup outbound proxy server, the default value is 5060. -account.1.backup_outbound_port = +{if isset($outbound_proxy_1_port)} +account.1.backup_outbound_port = $account.1.outbound_proxy_secondary +{else} +account.1.backup_outbound_port = {$account.1.sip_port} +{/if} #Configure the voice mail number of account 1. voice_mail.number.1 = {$voicemail_number} @@ -70,7 +75,11 @@ account.1.srv_ttl_timer_enable = #Configure the type of DNS-SRV query; 0-UDP, TCP and TLS (default), 1-UDP, 2-TCP, 3-TLS; #Require reboot; -account.1.dns_srv_type = + +{if $account.1.sip_transport == 'udp'}account.1.dns_srv_type = 0{/if} +{if $account.1.sip_transport == 'tcp'}account.1.dns_srv_type = 2{/if} +{if $account.1.sip_transport == 'tls'}account.1.dns_srv_type = 3{/if} + #Enable or disable the anonymous call feature; 0-Disabled (default), 1-Enabled; account.1.anonymous_call = @@ -642,7 +651,7 @@ account.3.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 3. -account.3.label = {$display_name} +account.3.label = {$account.3.display_name} #Configure the display name of account 3. account.3.display_name = {$account.3.display_name} diff --git a/resources/templates/provision/yealink/t40g/{$mac}.cfg b/resources/templates/provision/yealink/t40g/{$mac}.cfg index 80a22d3f34..626981c557 100644 --- a/resources/templates/provision/yealink/t40g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t40g/{$mac}.cfg @@ -17,7 +17,11 @@ account.1.label = {$account.1.display_name} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} +{if isset($account.1.server.1.address)} +account.1.user_name = {$account.1.user_id}@{$account.1.server_address} +{else} account.1.user_name = {$account.1.user_id} +{/if} account.1.sip_server_host = {$account.1.server_address} account.1.sip_server_port = {$account.1.sip_port} account.1.outbound_host = {$account.1.outbound_proxy} @@ -60,7 +64,13 @@ account.1.fallback.redundancy_type = 0 account.1.fallback.timeout = {$yealink_outbound_proxy_fallback_interval} account.1.sip_server.1.address = {$account.1.server.1.address} account.1.sip_server.1.port = {$account.1.sip_port} -account.1.sip_server.1.port = {$account.1.sip_port} + +#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR; +{if $account.1.sip_transport == 'udp'}account.1.sip_server.1.transport_type = 0{/if} +{if $account.1.sip_transport == 'tcp'}account.1.sip_server.1.transport_type = 1{/if} +{if $account.1.sip_transport == 'tls'}account.1.sip_server.1.transport_type = 2{/if} +{if $account.1.sip_transport == 'dns srv'}account.1.sip_server.1.transport_type = 3{/if} + #Configure the register expiry time (in seconds), the default value is 3600. account.1.sip_server.1.expires = {$account.1.register_expires} account.1.sip_server.1.retry_counts = 3 @@ -69,6 +79,13 @@ account.1.sip_server.1.failback_timeout = 3600 account.1.sip_server.1.register_on_enable = 0 account.1.sip_server.2.address = {$account.1.server.2.address} account.1.sip_server.2.port = {$account.1.sip_port} + +#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR; +{if $account.1.sip_transport == 'udp'}account.1.sip_server.2.transport_type = 0{/if} +{if $account.1.sip_transport == 'tcp'}account.1.sip_server.2.transport_type = 1{/if} +{if $account.1.sip_transport == 'tls'}account.1.sip_server.2.transport_type = 2{/if} +{if $account.1.sip_transport == 'dns srv'}account.1.sip_server.2.transport_type = 3{/if} + account.1.sip_server.2.expires = {$account.1.register_expires} account.1.sip_server.2.retry_counts = 3 account.1.sip_server.2.failback_mode = 0 @@ -499,7 +516,10 @@ account.2.user_name = {$account.2.user_id} account.2.sip_server_host = {$account.2.server_address} account.2.sip_server_port = {$account.2.sip_port} account.2.outbound_host = {$account.2.outbound_proxy} + account.2.outbound_port = {$account.2.sip_port} +{if isset($yealink_sip_listen_port)}account.2.sip_listen_port = {$yealink_sip_listen_port}{else}account.2.sip_listen_port = 5060{/if} + account.2.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $account.2.sip_transport == 'udp'}account.2.transport = 0{/if} @@ -1008,7 +1028,10 @@ account.3.user_name = {$account.3.user_id} account.3.sip_server_host = {$account.3.server_address} account.3.sip_server_port = {$account.3.sip_port} account.3.outbound_host = {$account.3.outbound_proxy} + account.3.outbound_port = {$account.3.sip_port} +{if isset($yealink_sip_listen_port)}account.3.sip_listen_port = {$yealink_sip_listen_port}{else}account.3.sip_listen_port = 5060{/if} + account.3.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $account.3.sip_transport == 'udp'}account.3.transport = 0{/if} @@ -1499,7 +1522,10 @@ account.4.user_name = {$account.4.user_id} account.4.sip_server_host = {$account.4.server_address} account.4.sip_server_port = {$account.4.sip_port} account.4.outbound_host = {$account.4.outbound_proxy} + account.4.outbound_port = {$account.4.sip_port} +{if isset($yealink_sip_listen_port)}account.4.sip_listen_port = {$yealink_sip_listen_port}{else}account.4.sip_listen_port = 5060{/if} + account.4.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $account.4.sip_transport == 'udp'}account.4.transport = 0{/if} @@ -1990,7 +2016,10 @@ account.5.user_name = {$account.5.user_id} account.5.sip_server_host = {$account.5.server_address} account.5.sip_server_port = {$account.5.sip_port} account.5.outbound_host = {$account.5.outbound_proxy} + account.5.outbound_port = {$account.5.sip_port} +{if isset($yealink_sip_listen_port)}account.5.sip_listen_port = {$yealink_sip_listen_port}{else}account.5.sip_listen_port = 5060{/if} + account.5.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $account.5.sip_transport == 'udp'}account.5.transport = 0{/if} @@ -2023,7 +2052,7 @@ account.5.sip_server.1.retry_counts = 3 account.5.sip_server.1.failback_mode = 0 account.5.sip_server.1.failback_timeout = 3600 account.5.sip_server.1.register_on_enable = 0 -account.5.sip_server.2.address = {$account.15.server.2.address} +account.5.sip_server.2.address = {$account.5.server.2.address} account.5.sip_server.2.port = {$account.5.sip_port} account.5.sip_server.2.expires = {$account.5.register_expires} account.5.sip_server.2.retry_counts = 3 @@ -2481,7 +2510,10 @@ account.6.user_name = {$account.6.user_id} account.6.sip_server_host = {$account.6.server_address} account.6.sip_server_port = {$account.6.sip_port} account.6.outbound_host = {$account.6.outbound_proxy} + account.6.outbound_port = {$account.6.sip_port} +{if isset($yealink_sip_listen_port)}account.6.sip_listen_port = {$yealink_sip_listen_port}{else}account.6.sip_listen_port = 5060{/if} + account.6.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $account.6.sip_transport == 'udp'}account.6.transport = 0{/if} diff --git a/resources/templates/provision/yealink/t40p/{$mac}.cfg b/resources/templates/provision/yealink/t40p/{$mac}.cfg index 2acda58ce7..efb96f7f49 100644 --- a/resources/templates/provision/yealink/t40p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t40p/{$mac}.cfg @@ -20,6 +20,7 @@ account.1.password = {$account.1.password} account.1.user_name = {$account.1.user_id} account.1.sip_server_host = {$account.1.server_address} account.1.sip_server_port = {$account.1.sip_port} + account.1.outbound_host = {$account.1.outbound_proxy} account.1.outbound_port = {$account.1.sip_port} {if isset($yealink_sip_listen_port)}account.1.sip_listen_port = {$yealink_sip_listen_port}{else}account.1.sip_listen_port = 5060{/if} @@ -2962,6 +2963,7 @@ network.internet_port.gateway = #linekey.x.lable--Define the label for each line key. Meet-Me Conference "1" or BLF "16" require pick_value. {foreach $keys['line'] as $row} + #Configure Line Key {$row.device_key_id} linekey.{$row.device_key_id}.line = {$row.device_key_line} linekey.{$row.device_key_id}.value = {$row.device_key_value} @@ -2995,6 +2997,7 @@ linekey.{$row.device_key_id}.label = {$row.device_key_label} #memorykey.x.sub_type = {foreach $keys["memory"] as $row} + #Expansion Memory Key {$row.device_key_id} memorykey.{$row.device_key_id}.type = {$row.device_key_type} memorykey.{$row.device_key_id}.line = {$row.device_key_line} diff --git a/resources/templates/provision/yealink/t41p/{$mac}.cfg b/resources/templates/provision/yealink/t41p/{$mac}.cfg index 38b5cab4b0..3b41a549f8 100644 --- a/resources/templates/provision/yealink/t41p/{$mac}.cfg +++ b/resources/templates/provision/yealink/t41p/{$mac}.cfg @@ -2480,7 +2480,7 @@ account.6.user_name = {$account.6.user_id} account.6.sip_server_host = {$account.6.server_address} account.6.sip_server_port = {$account.6.sip_port} account.6.outbound_host = {$account.6.outbound_proxy} -account.6.outbound_port = 5060 +account.6.outbound_port = {$account.6.sip_port} account.6.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $account.6.sip_transport == 'udp'}account.6.transport = 0{/if} diff --git a/resources/templates/provision/yealink/t41s/{$mac}.cfg b/resources/templates/provision/yealink/t41s/{$mac}.cfg index 2acda58ce7..30b07c437c 100644 --- a/resources/templates/provision/yealink/t41s/{$mac}.cfg +++ b/resources/templates/provision/yealink/t41s/{$mac}.cfg @@ -17,7 +17,11 @@ account.1.label = {$account.1.display_name} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} +{if isset($account.1.server.1.address)} +account.1.user_name = {$account.1.user_id}@{$account.1.server_address} +{else} account.1.user_name = {$account.1.user_id} +{/if} account.1.sip_server_host = {$account.1.server_address} account.1.sip_server_port = {$account.1.sip_port} account.1.outbound_host = {$account.1.outbound_proxy} @@ -60,6 +64,13 @@ account.1.fallback.redundancy_type = 0 account.1.fallback.timeout = {$yealink_outbound_proxy_fallback_interval} account.1.sip_server.1.address = {$account.1.server.1.address} account.1.sip_server.1.port = {$account.1.sip_port} + +#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR; +{if $account.1.sip_transport == 'udp'}account.1.sip_server.1.transport_type = 0{/if} +{if $account.1.sip_transport == 'tcp'}account.1.sip_server.1.transport_type = 1{/if} +{if $account.1.sip_transport == 'tls'}account.1.sip_server.1.transport_type = 2{/if} +{if $account.1.sip_transport == 'dns srv'}account.1.sip_server.1.transport_type = 3{/if} + #Configure the register expiry time (in seconds), the default value is 3600. account.1.sip_server.1.expires = {$account.1.register_expires} account.1.sip_server.1.retry_counts = 3 @@ -68,6 +79,13 @@ account.1.sip_server.1.failback_timeout = 3600 account.1.sip_server.1.register_on_enable = 0 account.1.sip_server.2.address = {$account.1.server.2.address} account.1.sip_server.2.port = {$account.1.sip_port} + +#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR; +{if $account.1.sip_transport == 'udp'}account.1.sip_server.2.transport_type = 0{/if} +{if $account.1.sip_transport == 'tcp'}account.1.sip_server.2.transport_type = 1{/if} +{if $account.1.sip_transport == 'tls'}account.1.sip_server.2.transport_type = 2{/if} +{if $account.1.sip_transport == 'dns srv'}account.1.sip_server.2.transport_type = 3{/if} + account.1.sip_server.2.expires = {$account.1.register_expires} account.1.sip_server.2.retry_counts = 3 account.1.sip_server.2.failback_mode = 0 @@ -284,6 +302,10 @@ account.1.codec.12.payload_type = GSM account.1.codec.12.priority = 0 account.1.codec.12.rtpmap = 3 +account.1.codec.13.enable = 1 +account.1.codec.13.payload_type = opus +account.1.codec.13.priority = 1 +account.1.codec.13.rtpmap = 101 ####################################################################################### ## Audio Advanced ## @@ -498,7 +520,10 @@ account.2.user_name = {$account.2.user_id} account.2.sip_server_host = {$account.2.server_address} account.2.sip_server_port = {$account.2.sip_port} account.2.outbound_host = {$account.2.outbound_proxy} + account.2.outbound_port = {$account.2.sip_port} +{if isset($yealink_sip_listen_port)}account.2.sip_listen_port = {$yealink_sip_listen_port}{else}account.2.sip_listen_port = 5060{/if} + account.2.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $account.2.sip_transport == 'udp'}account.2.transport = 0{/if} @@ -749,6 +774,10 @@ account.2.codec.12.payload_type = GSM account.2.codec.12.priority = 0 account.2.codec.12.rtpmap = 3 +account.2.codec.13.enable = 1 +account.2.codec.13.payload_type = opus +account.2.codec.13.priority = 1 +account.2.codec.13.rtpmap = 101 ####################################################################################### ## Audio Advanced ## @@ -1007,7 +1036,10 @@ account.3.user_name = {$account.3.user_id} account.3.sip_server_host = {$account.3.server_address} account.3.sip_server_port = {$account.3.sip_port} account.3.outbound_host = {$account.3.outbound_proxy} + account.3.outbound_port = {$account.3.sip_port} +{if isset($yealink_sip_listen_port)}account.3.sip_listen_port = {$yealink_sip_listen_port}{else}account.3.sip_listen_port = 5060{/if} + account.3.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $account.3.sip_transport == 'udp'}account.3.transport = 0{/if} @@ -1258,6 +1290,11 @@ account.3.codec.12.payload_type = GSM account.3.codec.12.priority = 0 account.3.codec.12.rtpmap = 3 +account.3.codec.13.enable = 1 +account.3.codec.13.payload_type = opus +account.3.codec.13.priority = 1 +account.3.codec.13.rtpmap = 101 + ####################################################################################### ## Audio Advanced ## @@ -1498,7 +1535,10 @@ account.4.user_name = {$account.4.user_id} account.4.sip_server_host = {$account.4.server_address} account.4.sip_server_port = {$account.4.sip_port} account.4.outbound_host = {$account.4.outbound_proxy} + account.4.outbound_port = {$account.4.sip_port} +{if isset($yealink_sip_listen_port)}account.4.sip_listen_port = {$yealink_sip_listen_port}{else}account.4.sip_listen_port = 5060{/if} + account.4.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $account.4.sip_transport == 'udp'}account.4.transport = 0{/if} @@ -1989,7 +2029,10 @@ account.5.user_name = {$account.5.user_id} account.5.sip_server_host = {$account.5.server_address} account.5.sip_server_port = {$account.5.sip_port} account.5.outbound_host = {$account.5.outbound_proxy} + account.5.outbound_port = {$account.5.sip_port} +{if isset($yealink_sip_listen_port)}account.5.sip_listen_port = {$yealink_sip_listen_port}{else}account.5.sip_listen_port = 5060{/if} + account.5.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $account.5.sip_transport == 'udp'}account.5.transport = 0{/if} @@ -2480,7 +2523,10 @@ account.6.user_name = {$account.6.user_id} account.6.sip_server_host = {$account.6.server_address} account.6.sip_server_port = {$account.6.sip_port} account.6.outbound_host = {$account.6.outbound_proxy} + account.6.outbound_port = {$account.6.sip_port} +{if isset($yealink_sip_listen_port)}account.6.sip_listen_port = {$yealink_sip_listen_port}{else}account.6.sip_listen_port = 5060{/if} + account.6.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $account.6.sip_transport == 'udp'}account.6.transport = 0{/if} diff --git a/resources/templates/provision/yealink/t42g/{$mac}.cfg b/resources/templates/provision/yealink/t42g/{$mac}.cfg index 7b3a6fcefc..dbe8b4556c 100644 --- a/resources/templates/provision/yealink/t42g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t42g/{$mac}.cfg @@ -70,7 +70,6 @@ account.1.sip_server.1.port = {$account.1.sip_port} {if $account.1.sip_transport == 'tcp'}account.1.sip_server.1.transport_type = 1{/if} {if $account.1.sip_transport == 'tls'}account.1.sip_server.1.transport_type = 2{/if} {if $account.1.sip_transport == 'dns srv'}account.1.sip_server.1.transport_type = 3{/if} -account.X.sip_server.Y.transport_type #Configure the register expiry time (in seconds), the default value is 3600. account.1.sip_server.1.expires = {$account.1.register_expires} @@ -220,7 +219,7 @@ account.1.out_dialog_blf_enable = 0 ##account.X.shared_line = #Assign account1 as shared line; 0-Disabled (default), 1-Broadsoft SCA, 2-BLA; -{if isset($account.1.shared_line_ } +{if isset($account.1.shared_line) } account.1.shared_line = {$account.1.shared_line} {else} account.1.shared_line = 0 diff --git a/resources/templates/provision/yealink/t42s/{$mac}.cfg b/resources/templates/provision/yealink/t42s/{$mac}.cfg index e493f5362e..21832f7ee6 100644 --- a/resources/templates/provision/yealink/t42s/{$mac}.cfg +++ b/resources/templates/provision/yealink/t42s/{$mac}.cfg @@ -64,7 +64,6 @@ account.1.fallback.redundancy_type = 0 account.1.fallback.timeout = {$yealink_outbound_proxy_fallback_interval} account.1.sip_server.1.address = {$account.1.server.1.address} account.1.sip_server.1.port = {$account.1.sip_port} -account.1.sip_server.1.port = {$account.1.sip_port} #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR; {if $account.1.sip_transport == 'udp'}account.1.sip_server.1.transport_type = 0{/if} @@ -303,6 +302,10 @@ account.1.codec.12.payload_type = GSM account.1.codec.12.priority = 0 account.1.codec.12.rtpmap = 3 +account.1.codec.13.enable = 1 +account.1.codec.13.payload_type = opus +account.1.codec.13.priority = 1 +account.1.codec.13.rtpmap = 101 ####################################################################################### ## Audio Advanced ## @@ -517,7 +520,10 @@ account.2.user_name = {$account.2.user_id} account.2.sip_server_host = {$account.2.server_address} account.2.sip_server_port = {$account.2.sip_port} account.2.outbound_host = {$account.2.outbound_proxy} -account.2.outbound_port = 5060 + +account.2.outbound_port = {$account.2.sip_port} +{if isset($yealink_sip_listen_port)}account.2.sip_listen_port = {$yealink_sip_listen_port}{else}account.2.sip_listen_port = 5060{/if} + account.2.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $account.2.sip_transport == 'udp'}account.2.transport = 0{/if} @@ -768,6 +774,10 @@ account.2.codec.12.payload_type = GSM account.2.codec.12.priority = 0 account.2.codec.12.rtpmap = 3 +account.2.codec.13.enable = 1 +account.2.codec.13.payload_type = opus +account.2.codec.13.priority = 1 +account.2.codec.13.rtpmap = 101 ####################################################################################### ## Audio Advanced ## @@ -1026,7 +1036,10 @@ account.3.user_name = {$account.3.user_id} account.3.sip_server_host = {$account.3.server_address} account.3.sip_server_port = {$account.3.sip_port} account.3.outbound_host = {$account.3.outbound_proxy} + account.3.outbound_port = {$account.3.sip_port} +{if isset($yealink_sip_listen_port)}account.3.sip_listen_port = {$yealink_sip_listen_port}{else}account.3.sip_listen_port = 5060{/if} + account.3.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $account.3.sip_transport == 'udp'}account.3.transport = 0{/if} @@ -1277,6 +1290,11 @@ account.3.codec.12.payload_type = GSM account.3.codec.12.priority = 0 account.3.codec.12.rtpmap = 3 +account.3.codec.13.enable = 1 +account.3.codec.13.payload_type = opus +account.3.codec.13.priority = 1 +account.3.codec.13.rtpmap = 101 + ####################################################################################### ## Audio Advanced ## @@ -1517,7 +1535,10 @@ account.4.user_name = {$account.4.user_id} account.4.sip_server_host = {$account.4.server_address} account.4.sip_server_port = {$account.4.sip_port} account.4.outbound_host = {$account.4.outbound_proxy} + account.4.outbound_port = {$account.4.sip_port} +{if isset($yealink_sip_listen_port)}account.4.sip_listen_port = {$yealink_sip_listen_port}{else}account.4.sip_listen_port = 5060{/if} + account.4.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $account.4.sip_transport == 'udp'}account.4.transport = 0{/if} @@ -2008,7 +2029,10 @@ account.5.user_name = {$account.5.user_id} account.5.sip_server_host = {$account.5.server_address} account.5.sip_server_port = {$account.5.sip_port} account.5.outbound_host = {$account.5.outbound_proxy} + account.5.outbound_port = {$account.5.sip_port} +{if isset($yealink_sip_listen_port)}account.5.sip_listen_port = {$yealink_sip_listen_port}{else}account.5.sip_listen_port = 5060{/if} + account.5.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $account.5.sip_transport == 'udp'}account.5.transport = 0{/if} @@ -2499,7 +2523,10 @@ account.6.user_name = {$account.6.user_id} account.6.sip_server_host = {$account.6.server_address} account.6.sip_server_port = {$account.6.sip_port} account.6.outbound_host = {$account.6.outbound_proxy} + account.6.outbound_port = {$account.6.sip_port} +{if isset($yealink_sip_listen_port)}account.6.sip_listen_port = {$yealink_sip_listen_port}{else}account.6.sip_listen_port = 5060{/if} + account.6.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $account.6.sip_transport == 'udp'}account.6.transport = 0{/if} @@ -2509,7 +2536,7 @@ account.6.sip_listen_port = 5060 account.6.outbound_proxy.1.address = {$account.6.outbound_proxy_primary} account.6.outbound_proxy.2.address = {$account.6.outbound_proxy_secondary} -account.6.outbound_proxy_enable = {if isset($oaccount.6.utbound_proxy_primary)}1{else}0{/if} +account.6.outbound_proxy_enable = {if isset($account.6.outbound_proxy_primary)}1{else}0{/if} ####################################################################################### ## Failback ## diff --git a/resources/templates/provision/yealink/t46g/{$mac}.cfg b/resources/templates/provision/yealink/t46g/{$mac}.cfg index b1503c7748..dbe8b4556c 100755 --- a/resources/templates/provision/yealink/t46g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t46g/{$mac}.cfg @@ -545,7 +545,7 @@ account.2.naptr_build = 0 account.2.fallback.redundancy_type = 0 account.2.fallback.timeout = {$yealink_outbound_proxy_fallback_interval} account.2.sip_server.1.address = {$account.2.server.1.address} -account.2.sip_server.1.port = {$account.2.sip_port} +account.2.sip_server.1.port = {$account.2.sip_port} #Configure the register expiry time (in seconds), the default value is 3600. account.2.sip_server.1.expires = {$account.2.register_expires} account.2.sip_server.1.retry_counts = 3 @@ -553,7 +553,7 @@ account.2.sip_server.1.failback_mode = 0 account.2.sip_server.1.failback_timeout = 3600 account.2.sip_server.1.register_on_enable = 0 account.2.sip_server.2.address = {$account.2.server.2.address} -account.2.sip_server.2.port = {$account.2.sip_port} +account.2.sip_server.2.port = {$account.2.sip_port} account.2.sip_server.2.expires = {$account.2.register_expires} account.2.sip_server.2.retry_counts = 3 account.2.sip_server.2.failback_mode = 0 @@ -1465,7 +1465,7 @@ account.4.enable = 0 account.4.label = {$account.4.display_name} account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} -account.4.password = {$account.4.user_password} +account.4.password = {$account.4.password} account.4.user_name = {$account.4.user_id} account.4.sip_server_host = {$account.4.server_address} account.4.sip_server_port = {$account.4.sip_port} diff --git a/resources/templates/provision/yealink/t46s/{$mac}.cfg b/resources/templates/provision/yealink/t46s/{$mac}.cfg index 30ea78d079..182db5d004 100644 --- a/resources/templates/provision/yealink/t46s/{$mac}.cfg +++ b/resources/templates/provision/yealink/t46s/{$mac}.cfg @@ -24,7 +24,7 @@ account.1.user_name = {$account.1.user_id} {/if} account.1.sip_server_host = {$account.1.server_address} account.1.sip_server_port = {$account.1.sip_port} -account.1.outbound_host = {$account.1.outbound_proxy_primary} +account.1.outbound_host = {$account.1.outbound_proxy} account.1.outbound_port = {$account.1.sip_port} {if isset($yealink_sip_listen_port)}account.1.sip_listen_port = {$yealink_sip_listen_port}{else}account.1.sip_listen_port = 5060{/if} @@ -307,7 +307,6 @@ account.1.codec.13.payload_type = opus account.1.codec.13.priority = 1 account.1.codec.13.rtpmap = 101 - ####################################################################################### ## Audio Advanced ## ####################################################################################### @@ -1520,7 +1519,7 @@ account.4.sip_server.1.retry_counts = 3 account.4.sip_server.1.failback_mode = 0 account.4.sip_server.1.failback_timeout = 3600 account.4.sip_server.1.register_on_enable = 0 -account.4.sip_server.2.address = {$account.4.server.1.address} +account.4.sip_server.2.address = {$account.4.server.2.address} account.4.sip_server.2.port = {$account.4.sip_port} account.4.sip_server.2.expires = {$account.4.register_expires} account.4.sip_server.2.retry_counts = 3 diff --git a/resources/templates/provision/yealink/t48g/{$mac}.cfg b/resources/templates/provision/yealink/t48g/{$mac}.cfg index aaba0492d7..dbe8b4556c 100644 --- a/resources/templates/provision/yealink/t48g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t48g/{$mac}.cfg @@ -17,7 +17,11 @@ account.1.label = {$account.1.display_name} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} +{if isset($account.1.server.1.address)} +account.1.user_name = {$account.1.user_id}@{$account.1.server_address} +{else} account.1.user_name = {$account.1.user_id} +{/if} account.1.sip_server_host = {$account.1.server_address} account.1.sip_server_port = {$account.1.sip_port} account.1.outbound_host = {$account.1.outbound_proxy} @@ -60,14 +64,28 @@ account.1.fallback.redundancy_type = 0 account.1.fallback.timeout = {$yealink_outbound_proxy_fallback_interval} account.1.sip_server.1.address = {$account.1.server.1.address} account.1.sip_server.1.port = {$account.1.sip_port} + +#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR; +{if $account.1.sip_transport == 'udp'}account.1.sip_server.1.transport_type = 0{/if} +{if $account.1.sip_transport == 'tcp'}account.1.sip_server.1.transport_type = 1{/if} +{if $account.1.sip_transport == 'tls'}account.1.sip_server.1.transport_type = 2{/if} +{if $account.1.sip_transport == 'dns srv'}account.1.sip_server.1.transport_type = 3{/if} + #Configure the register expiry time (in seconds), the default value is 3600. -account.1.sip_server.1.expires = {$register_expires_1} +account.1.sip_server.1.expires = {$account.1.register_expires} account.1.sip_server.1.retry_counts = 3 account.1.sip_server.1.failback_mode = 0 account.1.sip_server.1.failback_timeout = 3600 account.1.sip_server.1.register_on_enable = 0 account.1.sip_server.2.address = {$account.1.server.2.address} account.1.sip_server.2.port = {$account.1.sip_port} + +#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR; +{if $account.1.sip_transport == 'udp'}account.1.sip_server.2.transport_type = 0{/if} +{if $account.1.sip_transport == 'tcp'}account.1.sip_server.2.transport_type = 1{/if} +{if $account.1.sip_transport == 'tls'}account.1.sip_server.2.transport_type = 2{/if} +{if $account.1.sip_transport == 'dns srv'}account.1.sip_server.2.transport_type = 3{/if} + account.1.sip_server.2.expires = {$account.1.register_expires} account.1.sip_server.2.retry_counts = 3 account.1.sip_server.2.failback_mode = 0 @@ -977,7 +995,7 @@ account.3.display_name = {$account.3.display_name} account.3.auth_name = {$account.3.auth_id} account.3.password = {$account.3.password} account.3.user_name = {$account.3.user_id} -account.3.sip_server_host = {$account.3.account.3.server_address} +account.3.sip_server_host = {$account.3.server_address} account.3.sip_server_port = {$account.3.sip_port} account.3.outbound_host = {$account.3.outbound_proxy} @@ -986,7 +1004,7 @@ account.3.outbound_port = {$account.3.sip_port} account.3.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; -{if $account.3.account.3.sip_transport == 'udp'}account.3.transport = 0{/if} +{if $account.3.sip_transport == 'udp'}account.3.transport = 0{/if} {if $account.3.sip_transport == 'tcp'}account.3.transport = 1{/if} {if $account.3.sip_transport == 'tls'}account.3.transport = 2{/if} {if $account.3.sip_transport == 'dns srv'}account.3.transport = 3{/if} diff --git a/resources/templates/provision/yealink/t48s/{$mac}.cfg b/resources/templates/provision/yealink/t48s/{$mac}.cfg index 2d228d1dfd..804006ed3c 100644 --- a/resources/templates/provision/yealink/t48s/{$mac}.cfg +++ b/resources/templates/provision/yealink/t48s/{$mac}.cfg @@ -17,7 +17,11 @@ account.1.label = {$account.1.display_name} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} +{if isset($account.1.server.1.address)} +account.1.user_name = {$account.1.user_id}@{$account.1.server_address} +{else} account.1.user_name = {$account.1.user_id} +{/if} account.1.sip_server_host = {$account.1.server_address} account.1.sip_server_port = {$account.1.sip_port} account.1.outbound_host = {$account.1.outbound_proxy} @@ -60,6 +64,13 @@ account.1.fallback.redundancy_type = 0 account.1.fallback.timeout = {$yealink_outbound_proxy_fallback_interval} account.1.sip_server.1.address = {$account.1.server.1.address} account.1.sip_server.1.port = {$account.1.sip_port} + +#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR; +{if $account.1.sip_transport == 'udp'}account.1.sip_server.1.transport_type = 0{/if} +{if $account.1.sip_transport == 'tcp'}account.1.sip_server.1.transport_type = 1{/if} +{if $account.1.sip_transport == 'tls'}account.1.sip_server.1.transport_type = 2{/if} +{if $account.1.sip_transport == 'dns srv'}account.1.sip_server.1.transport_type = 3{/if} + #Configure the register expiry time (in seconds), the default value is 3600. account.1.sip_server.1.expires = {$account.1.register_expires} account.1.sip_server.1.retry_counts = 3 @@ -68,6 +79,13 @@ account.1.sip_server.1.failback_timeout = 3600 account.1.sip_server.1.register_on_enable = 0 account.1.sip_server.2.address = {$account.1.server.2.address} account.1.sip_server.2.port = {$account.1.sip_port} + +#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR; +{if $account.1.sip_transport == 'udp'}account.1.sip_server.2.transport_type = 0{/if} +{if $account.1.sip_transport == 'tcp'}account.1.sip_server.2.transport_type = 1{/if} +{if $account.1.sip_transport == 'tls'}account.1.sip_server.2.transport_type = 2{/if} +{if $account.1.sip_transport == 'dns srv'}account.1.sip_server.2.transport_type = 3{/if} + account.1.sip_server.2.expires = {$account.1.register_expires} account.1.sip_server.2.retry_counts = 3 account.1.sip_server.2.failback_mode = 0 @@ -502,7 +520,10 @@ account.2.user_name = {$account.2.user_id} account.2.sip_server_host = {$account.2.server_address} account.2.sip_server_port = {$account.2.sip_port} account.2.outbound_host = {$account.2.outbound_proxy} + account.2.outbound_port = {$account.2.sip_port} +{if isset($yealink_sip_listen_port)}account.2.sip_listen_port = {$yealink_sip_listen_port}{else}account.2.sip_listen_port = 5060{/if} + account.2.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $account.2.sip_transport == 'udp'}account.2.transport = 0{/if} @@ -535,7 +556,7 @@ account.2.sip_server.1.retry_counts = 3 account.2.sip_server.1.failback_mode = 0 account.2.sip_server.1.failback_timeout = 3600 account.2.sip_server.1.register_on_enable = 0 -account.2.sip_server.2.address = {$account.1.server.2.address} +account.2.sip_server.2.address = {$account.2.server.2.address} account.2.sip_server.2.port = {$account.2.sip_port} account.2.sip_server.2.expires = {$account.2.register_expires} account.2.sip_server.2.retry_counts = 3 @@ -1015,7 +1036,10 @@ account.3.user_name = {$account.3.user_id} account.3.sip_server_host = {$account.3.server_address} account.3.sip_server_port = {$account.3.sip_port} account.3.outbound_host = {$account.3.outbound_proxy} + account.3.outbound_port = {$account.3.sip_port} +{if isset($yealink_sip_listen_port)}account.3.sip_listen_port = {$yealink_sip_listen_port}{else}account.3.sip_listen_port = 5060{/if} + account.3.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $account.3.sip_transport == 'udp'}account.3.transport = 0{/if} @@ -1511,7 +1535,10 @@ account.4.user_name = {$account.4.user_id} account.4.sip_server_host = {$account.4.server_address} account.4.sip_server_port = {$account.4.sip_port} account.4.outbound_host = {$account.4.outbound_proxy} + account.4.outbound_port = {$account.4.sip_port} +{if isset($yealink_sip_listen_port)}account.4.sip_listen_port = {$yealink_sip_listen_port}{else}account.4.sip_listen_port = 5060{/if} + account.4.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $account.4.sip_transport == 'udp'}account.4.transport = 0{/if} @@ -1989,7 +2016,7 @@ network.internet_port.gateway = ####################################################################################### ## ranges from 1 to 6; ##account.X.enable = -{if isset($account.5.user_password) } +{if isset($account.5.password) } account.5.enable = 1 {else} account.5.enable = 0 @@ -2002,7 +2029,10 @@ account.5.user_name = {$account.5.user_id} account.5.sip_server_host = {$account.5.server_address} account.5.sip_server_port = {$account.5.sip_port} account.5.outbound_host = {$account.5.outbound_proxy} + account.5.outbound_port = {$account.5.sip_port} +{if isset($yealink_sip_listen_port)}account.5.sip_listen_port = {$yealink_sip_listen_port}{else}account.5.sip_listen_port = 5060{/if} + account.5.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $account.5.sip_transport == 'udp'}account.5.transport = 0{/if} @@ -2493,7 +2523,10 @@ account.6.user_name = {$account.6.user_id} account.6.sip_server_host = {$account.6.server_address} account.6.sip_server_port = {$account.6.sip_port} account.6.outbound_host = {$account.6.outbound_proxy} + account.6.outbound_port = {$account.6.sip_port} +{if isset($yealink_sip_listen_port)}account.6.sip_listen_port = {$yealink_sip_listen_port}{else}account.6.sip_listen_port = 5060{/if} + account.6.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $account.6.sip_transport == 'udp'}account.6.transport = 0{/if} diff --git a/resources/templates/provision/yealink/t49g/{$mac}.cfg b/resources/templates/provision/yealink/t49g/{$mac}.cfg index ef766301f8..8eec6bd003 100644 --- a/resources/templates/provision/yealink/t49g/{$mac}.cfg +++ b/resources/templates/provision/yealink/t49g/{$mac}.cfg @@ -17,7 +17,11 @@ account.1.label = {$account.1.display_name} account.1.display_name = {$account.1.display_name} account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} +{if isset($account.1.server.1.address)} +account.1.user_name = {$account.1.user_id}@{$account.1.server_address} +{else} account.1.user_name = {$account.1.user_id} +{/if} account.1.sip_server_host = {$account.1.server_address} account.1.sip_server_port = {$account.1.sip_port} account.1.outbound_host = {$account.1.outbound_proxy} @@ -60,6 +64,13 @@ account.1.fallback.redundancy_type = 0 account.1.fallback.timeout = {$yealink_outbound_proxy_fallback_interval} account.1.sip_server.1.address = {$account.1.server.1.address} account.1.sip_server.1.port = {$account.1.sip_port} + +#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR; +{if $account.1.sip_transport == 'udp'}account.1.sip_server.1.transport_type = 0{/if} +{if $account.1.sip_transport == 'tcp'}account.1.sip_server.1.transport_type = 1{/if} +{if $account.1.sip_transport == 'tls'}account.1.sip_server.1.transport_type = 2{/if} +{if $account.1.sip_transport == 'dns srv'}account.1.sip_server.1.transport_type = 3{/if} + #Configure the register expiry time (in seconds), the default value is 3600. account.1.sip_server.1.expires = {$account.1.register_expires} account.1.sip_server.1.retry_counts = 3 @@ -68,6 +79,13 @@ account.1.sip_server.1.failback_timeout = 3600 account.1.sip_server.1.register_on_enable = 0 account.1.sip_server.2.address = {$account.1.server.2.address} account.1.sip_server.2.port = {$account.1.sip_port} + +#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR; +{if $account.1.sip_transport == 'udp'}account.1.sip_server.2.transport_type = 0{/if} +{if $account.1.sip_transport == 'tcp'}account.1.sip_server.2.transport_type = 1{/if} +{if $account.1.sip_transport == 'tls'}account.1.sip_server.2.transport_type = 2{/if} +{if $account.1.sip_transport == 'dns srv'}account.1.sip_server.2.transport_type = 3{/if} + account.1.sip_server.2.expires = {$account.1.register_expires} account.1.sip_server.2.retry_counts = 3 account.1.sip_server.2.failback_mode = 0 @@ -498,7 +516,10 @@ account.2.user_name = {$account.2.user_id} account.2.sip_server_host = {$account.2.server_address} account.2.sip_server_port = {$account.2.sip_port} account.2.outbound_host = {$account.2.outbound_proxy} + account.2.outbound_port = {$account.2.sip_port} +{if isset($yealink_sip_listen_port)}account.2.sip_listen_port = {$yealink_sip_listen_port}{else}account.2.sip_listen_port = 5060{/if} + account.2.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $account.2.sip_transport == 'udp'}account.2.transport = 0{/if} @@ -1007,7 +1028,10 @@ account.3.user_name = {$account.3.user_id} account.3.sip_server_host = {$account.3.server_address} account.3.sip_server_port = {$account.3.sip_port} account.3.outbound_host = {$account.3.outbound_proxy} + account.3.outbound_port = {$account.3.sip_port} +{if isset($yealink_sip_listen_port)}account.3.sip_listen_port = {$yealink_sip_listen_port}{else}account.3.sip_listen_port = 5060{/if} + account.3.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $account.3.sip_transport == 'udp'}account.3.transport = 0{/if} @@ -1498,7 +1522,10 @@ account.4.user_name = {$account.4.user_id} account.4.sip_server_host = {$account.4.server_address} account.4.sip_server_port = {$account.4.sip_port} account.4.outbound_host = {$account.4.outbound_proxy} + account.4.outbound_port = {$account.4.sip_port} +{if isset($yealink_sip_listen_port)}account.4.sip_listen_port = {$yealink_sip_listen_port}{else}account.4.sip_listen_port = 5060{/if} + account.4.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $account.4.sip_transport == 'udp'}account.4.transport = 0{/if} @@ -1989,7 +2016,10 @@ account.5.user_name = {$account.5.user_id} account.5.sip_server_host = {$account.5.server_address} account.5.sip_server_port = {$account.5.sip_port} account.5.outbound_host = {$account.5.outbound_proxy} + account.5.outbound_port = {$account.5.sip_port} +{if isset($yealink_sip_listen_port)}account.5.sip_listen_port = {$yealink_sip_listen_port}{else}account.5.sip_listen_port = 5060{/if} + account.5.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $account.5.sip_transport == 'udp'}account.5.transport = 0{/if} @@ -2480,7 +2510,10 @@ account.6.user_name = {$account.6.user_id} account.6.sip_server_host = {$account.6.server_address} account.6.sip_server_port = {$account.6.sip_port} account.6.outbound_host = {$account.6.outbound_proxy} + account.6.outbound_port = {$account.6.sip_port} +{if isset($yealink_sip_listen_port)}account.6.sip_listen_port = {$yealink_sip_listen_port}{else}account.6.sip_listen_port = 5060{/if} + account.6.sip_listen_port = 5060 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $account.6.sip_transport == 'udp'}account.6.transport = 0{/if} @@ -2505,7 +2538,7 @@ account.6.failback_timeout = 3600 account.6.naptr_build = 0 account.6.fallback.redundancy_type = 0 account.6.fallback.timeout = {$yealink_outbound_proxy_fallback_interval} -account.6.sip_server.1.address = {$account.6.server.2.address} +account.6.sip_server.1.address = {$account.6.server.1.address} account.6.sip_server.1.port = {$account.6.sip_port} #Configure the register expiry time (in seconds), the default value is 3600. account.6.sip_server.1.expires = {$account.6.register_expires} diff --git a/resources/templates/provision/yealink/t52s/{$mac}.cfg b/resources/templates/provision/yealink/t52s/{$mac}.cfg index 9e5ad54bc6..845652ab4e 100644 --- a/resources/templates/provision/yealink/t52s/{$mac}.cfg +++ b/resources/templates/provision/yealink/t52s/{$mac}.cfg @@ -206,7 +206,7 @@ account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} account.1.user_name = {$account.1.user_id} -account.1.sip_server.1.address= {$account.1.server.1.address} +account.1.sip_server.1.address= {$account.1.server_address} account.1.sip_server.1.port= {$account.1.sip_port} diff --git a/resources/templates/provision/yealink/t56a/{$mac}.cfg b/resources/templates/provision/yealink/t56a/{$mac}.cfg index 85dd00a7ab..b875f352eb 100644 --- a/resources/templates/provision/yealink/t56a/{$mac}.cfg +++ b/resources/templates/provision/yealink/t56a/{$mac}.cfg @@ -534,7 +534,7 @@ account.2.sip_server.1.failback_mode = 0 account.2.sip_server.1.failback_timeout = 3600 account.2.sip_server.1.register_on_enable = 0 account.2.sip_server.2.address = {$account.2.server.2.address} -account.2.sip_server.2.port = {$account.2.sip_port} +account.2.sip_server.2.port = {$account.2.sip_port} account.2.sip_server.2.expires = {$account.2.register_expires} account.2.sip_server.2.retry_counts = 3 account.2.sip_server.2.failback_mode = 0 @@ -978,7 +978,7 @@ account.3.naptr_build = 0 account.3.fallback.redundancy_type = 0 account.3.fallback.timeout = {$yealink_outbound_proxy_fallback_interval} account.3.sip_server.1.address = {$account.3.server.1.address} -account.3.sip_server.1.port = {$account.2.sip_port} +account.3.sip_server.1.port = {$account.3.sip_port} account.3.sip_server.1.expires = {$account.3.register_expires} account.3.sip_server.1.retry_counts = 3 account.3.sip_server.1.failback_mode = 0 @@ -1390,7 +1390,7 @@ account.4.enable = 1 account.4.enable = 0 {/if} account.4.label = {$account.4.display_name} -account.4.display_name = {$account.4.isplay_name} +account.4.display_name = {$account.4.display_name} account.4.auth_name = {$account.4.auth_id} account.4.password = {$account.4.password} account.4.user_name = {$account.4.user_id} @@ -1428,14 +1428,14 @@ account.4.naptr_build = 0 account.4.fallback.redundancy_type = 0 account.4.fallback.timeout = {$yealink_outbound_proxy_fallback_interval} account.4.sip_server.1.address = {$account.4.server.1.address} -account.4.sip_server.1.port = $account.4.sip_port} +account.4.sip_server.1.port = {$account.4.sip_port} account.4.sip_server.1.expires = {$account.4.register_expires} account.4.sip_server.1.retry_counts = 3 account.4.sip_server.1.failback_mode = 0 account.4.sip_server.1.failback_timeout = 3600 account.4.sip_server.1.register_on_enable = 0 account.4.sip_server.2.address = {$account.4.server.2.address} -account.4.sip_server.2.port = $account.4.sip_port} +account.4.sip_server.2.port = {$account.4.sip_port} account.4.sip_server.2.expires = {$account.4.register_expires} account.4.sip_server.2.retry_counts = 3 account.4.sip_server.2.failback_mode = 0 diff --git a/resources/templates/provision/yealink/t58v/{$mac}.cfg b/resources/templates/provision/yealink/t58v/{$mac}.cfg index 3c49222d7c..b875f352eb 100644 --- a/resources/templates/provision/yealink/t58v/{$mac}.cfg +++ b/resources/templates/provision/yealink/t58v/{$mac}.cfg @@ -98,15 +98,15 @@ account.1.reg_fail_retry_interval = ###################################################################################### ##It enables or disables the NAT traversal for account X.0-Disabled,1-Enabled ##The default value is 0. -account.1.nat.nat_traversal = +account.1.nat.nat_traversal = {if isset($stun_server)}1{else}0{/if} ##It configures the type of keep-alive packets sent by the phone to the NAT static to keep the communication port open so that NAT can continue to function for account X. ##0-Dsiabled,1-Default: the phone sends UDP packets to the server,2-Option: the phone sends SIP OPTION packets to the server,3-Notify: the phone sends SIP NOTIFY packets to the server. ##The default value is 1. -account.1.nat.udp_update_enable = +account.1.nat.udp_update_enable = 3 ##It configures the keep-alive interval (in seconds) for account X. ##The default value is 30.Integer from 15 to 2147483647 -account.1.nat.udp_update_time = +account.1.nat.udp_update_time = 30 ##It enables or disables NAT Rport feature for account X.0-Disabled,1-Enabled ##The default value is 0. @@ -194,7 +194,7 @@ account.1.blf.match_host.enable= ####################################################################################### ##It enables or disables Broadsoft SCA feature for account X.0-Disabled,1-Broadsoft SCA. ##The default value is 0. -account.1.shared_line = {$shared_line_1} +account.1.shared_line = {$account.1.shared_line} ##It configures the BLA number for account X. ##The default value is blank. @@ -984,7 +984,7 @@ account.3.sip_server.1.retry_counts = 3 account.3.sip_server.1.failback_mode = 0 account.3.sip_server.1.failback_timeout = 3600 account.3.sip_server.1.register_on_enable = 0 -account.3.sip_server.2.address = {$account.3.server.1.address} +account.3.sip_server.2.address = {$account.3.server.2.address} account.3.sip_server.2.port = {$account.3.sip_port} account.3.sip_server.2.expires = {$account.3.register_expires} account.3.sip_server.2.retry_counts = 3 diff --git a/resources/templates/provision/yealink/w52p/{$mac}.cfg b/resources/templates/provision/yealink/w52p/{$mac}.cfg index 06b2d16dbd..acc6568a3a 100644 --- a/resources/templates/provision/yealink/w52p/{$mac}.cfg +++ b/resources/templates/provision/yealink/w52p/{$mac}.cfg @@ -21,7 +21,7 @@ account.1.label = {$account.1.display_name} account.1.display_name = {$account.1.display_name} #Configure the username and password for register authentication. -account.1.auth_name = {$account.1.user_id} +account.1.auth_name = {$account.1.auth_id} account.1.password = {$account.1.password} #Configure the register user name. @@ -93,7 +93,7 @@ account.1.anonymous_reject_offcode = account.1.sip_listen_port = #Configure the register expiry time (in seconds), the default value is 3600. -account.1.expires = {$register_expires_1} +account.1.expires = {$account.1.register_expires} #Enable or disable the 100 reliable retransmission; 0-Disabled, 1-Enabled (default); account.1.100rel_enable = {$yealink_retransmission} diff --git a/resources/templates/provision/yealink/w56p/{$mac}.cfg b/resources/templates/provision/yealink/w56p/{$mac}.cfg index 51417ce7a6..a73363b146 100644 --- a/resources/templates/provision/yealink/w56p/{$mac}.cfg +++ b/resources/templates/provision/yealink/w56p/{$mac}.cfg @@ -36,6 +36,7 @@ account.1.sip_server_host = {$account.1.server_address} #Specify the port for the SIP server. The default value is 5060. account.1.sip_server_port = {$account.1.sip_port} +{if isset($yealink_sip_listen_port)}account.1.sip_listen_port = {$yealink_sip_listen_port}{else}account.1.sip_listen_port = 5060{/if} #Enable or disable to use the outbound proxy server; 0-Disabled (default), 1-Enabled; @@ -45,7 +46,6 @@ account.1.outbound_host = {$account.1.outbound_proxy_primary} #Specify the server port, the default value is 5060. account.1.outbound_port = {$account.1.sip_port} -{if isset($yealink_sip_listen_port)}account.1.sip_listen_port = {$yealink_sip_listen_port}{else}account.1.sip_listen_port = 5060{/if} #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV; {if $account.1.sip_transport == 'udp'}account.1.transport = 0{/if} @@ -1060,14 +1060,14 @@ account.5.enable = 0 {/if} #Configure the label displayed on the LCD screen for account 1. -account.5.label = {$account.4.display_name} +account.5.label = {$account.5.display_name} #Configure the display name of account 1. -account.5.display_name = {$account.4.display_name} +account.5.display_name = {$account.5.display_name} #Configure the username and password for register authentication. -account.5.auth_name = {$account.4.auth_id} -account.5.password = {$account.4.password} +account.5.auth_name = {$account.5.auth_id} +account.5.password = {$account.5.password} #Configure the register user name. {if isset($account.5.server.1.address)} @@ -1075,6 +1075,7 @@ account.5.user_name = {$account.5.user_id}@{$account.5.server_address} {else} account.5.user_name = {$account.5.user_id} {/if} + #Configure the SIP server address. account.5.sip_server_host = {$account.5.server_address}