diff --git a/resources/templates/provision/yealink/t41s/y000000000068.cfg b/resources/templates/provision/yealink/t41s/y000000000068.cfg index b6602c6e51..aadf0b4d4f 100644 --- a/resources/templates/provision/yealink/t41s/y000000000068.cfg +++ b/resources/templates/provision/yealink/t41s/y000000000068.cfg @@ -100,15 +100,14 @@ static.network.vlan.dhcp_enable = static.network.vlan.dhcp_option = static.network.vlan.vlan_change.enable = -static.network.vlan.pc_port_priority = {$yealink_vlan_pc_cos} -static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id} -static.network.vlan.pc_port_enable = - static.network.vlan.internet_port_priority = {$yealink_vlan_cos} static.network.vlan.internet_port_vid = {$yealink_vlan_id} - {if isset($yealink_vlan_enable)}static.network.vlan.internet_port_enable = {$yealink_vlan_enable}{else}static.network.vlan.internet_port_enable = 0{/if} +static.network.vlan.pc_port_priority = {$yealink_vlan_pc_cos} +static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id} +{if isset($yealink_vlan_pc_enable)}static.network.vlan.pc_port_enable = {$yealink_vlan_pc_enable}{else}static.network.vlan.pc_port_enable = 0{/if} + ####################################################################################### ## Network VPN ## diff --git a/resources/templates/provision/yealink/t42s/y000000000067.cfg b/resources/templates/provision/yealink/t42s/y000000000067.cfg index 9e321858ea..2d1550f336 100644 --- a/resources/templates/provision/yealink/t42s/y000000000067.cfg +++ b/resources/templates/provision/yealink/t42s/y000000000067.cfg @@ -101,15 +101,14 @@ static.network.vlan.dhcp_enable = static.network.vlan.dhcp_option = static.network.vlan.vlan_change.enable = -static.network.vlan.pc_port_priority = {$yealink_vlan_pc_cos} -static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id} -static.network.vlan.pc_port_enable = - static.network.vlan.internet_port_priority = {$yealink_vlan_cos} static.network.vlan.internet_port_vid = {$yealink_vlan_id} - {if isset($yealink_vlan_enable)}static.network.vlan.internet_port_enable = {$yealink_vlan_enable}{else}static.network.vlan.internet_port_enable = 0{/if} +static.network.vlan.pc_port_priority = {$yealink_vlan_pc_cos} +static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id} +{if isset($yealink_vlan_pc_enable)}static.network.vlan.pc_port_enable = {$yealink_vlan_pc_enable}{else}static.network.vlan.pc_port_enable = 0{/if} + ####################################################################################### ## Network VPN ## diff --git a/resources/templates/provision/yealink/t42u/y000000000116.cfg b/resources/templates/provision/yealink/t42u/y000000000116.cfg index 5ad1cd6d4a..9d29747379 100644 --- a/resources/templates/provision/yealink/t42u/y000000000116.cfg +++ b/resources/templates/provision/yealink/t42u/y000000000116.cfg @@ -71,7 +71,8 @@ network.vlan.internet_port_priority = {$yealink_vlan_cos} #Enable or disable the VLAN of PC port; 0-Disabled (default), 1-Enabled; #Require reboot; -network.vlan.pc_port_enable = +{if isset($yealink_vlan_pc_enable)}network.vlan.pc_port_enable = {$yealink_vlan_pc_enable}{else}network.vlan.pc_port_enable = 0{/if} + #Configure the VLAN ID, it ranges from 1 to 4094, the default value is 1. #Require reboot; diff --git a/resources/templates/provision/yealink/t43u/y000000000107.cfg b/resources/templates/provision/yealink/t43u/y000000000107.cfg index 2a3e7eaf7f..3766b96c34 100644 --- a/resources/templates/provision/yealink/t43u/y000000000107.cfg +++ b/resources/templates/provision/yealink/t43u/y000000000107.cfg @@ -132,18 +132,14 @@ static.network.vlan.dhcp_enable = static.network.vlan.dhcp_option = static.network.vlan.vlan_change.enable = -static.network.vlan.pc_port_priority = {$yealink_vlan_pc_cos} -static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id} - -{if isset($yealink_vlan_pc_enable)}static.network.vlan.pc_port_enable = {$yealink_vlan_pc_enable}{else}static.network.vlan.pc_port_enable = 0{/if} - -#static.network.vlan.pc_port_enable = - static.network.vlan.internet_port_priority = {$yealink_vlan_cos} static.network.vlan.internet_port_vid = {$yealink_vlan_id} - {if isset($yealink_vlan_enable)}static.network.vlan.internet_port_enable = {$yealink_vlan_enable}{else}static.network.vlan.internet_port_enable = 0{/if} +static.network.vlan.pc_port_priority = {$yealink_vlan_pc_cos} +static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id} +{if isset($yealink_vlan_pc_enable)}static.network.vlan.pc_port_enable = {$yealink_vlan_pc_enable}{else}static.network.vlan.pc_port_enable = 0{/if} + ####################################################################################### ## Network VPN ## diff --git a/resources/templates/provision/yealink/t46s/y000000000066.cfg b/resources/templates/provision/yealink/t46s/y000000000066.cfg index e9006ee506..f480a93c26 100644 --- a/resources/templates/provision/yealink/t46s/y000000000066.cfg +++ b/resources/templates/provision/yealink/t46s/y000000000066.cfg @@ -98,18 +98,15 @@ static.network.lldp.packet_interval = ####################################################################################### static.network.vlan.dhcp_enable = static.network.vlan.dhcp_option = -static.network.vlan.vlan_change.enable = - -static.network.vlan.pc_port_priority = {$yealink_vlan_pc_cos} -static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id} - -{if isset($yealink_vlan_enable)}static.network.vlan.pc_port_enable = {$yealink_vlan_pc_enable}{else}static.network.vlan.pc_port_enable = 0{/if} static.network.vlan.internet_port_priority = {$yealink_vlan_cos} static.network.vlan.internet_port_vid = {$yealink_vlan_id} - {if isset($yealink_vlan_enable)}static.network.vlan.internet_port_enable = {$yealink_vlan_enable}{else}static.network.vlan.internet_port_enable = 0{/if} +static.network.vlan.pc_port_priority = {$yealink_vlan_pc_cos} +static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id} +{if isset($yealink_vlan_pc_enable)}static.network.vlan.pc_port_enable = {$yealink_vlan_pc_enable}{else}static.network.vlan.pc_port_enable = 0{/if} + ####################################################################################### ## Network VPN ## diff --git a/resources/templates/provision/yealink/t46u/y000000000108.cfg b/resources/templates/provision/yealink/t46u/y000000000108.cfg index 0272d677ea..6ac9a1ad25 100644 --- a/resources/templates/provision/yealink/t46u/y000000000108.cfg +++ b/resources/templates/provision/yealink/t46u/y000000000108.cfg @@ -130,20 +130,15 @@ static.network.lldp.packet_interval = ####################################################################################### static.network.vlan.dhcp_enable = static.network.vlan.dhcp_option = -static.network.vlan.vlan_change.enable = - -static.network.vlan.pc_port_priority = {$yealink_vlan_pc_cos} -static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id} - -{if isset($yealink_vlan_pc_enable)}static.network.vlan.pc_port_enable = {$yealink_vlan_pc_enable}{else}static.network.vlan.pc_port_enable = 0{/if} - -#static.network.vlan.pc_port_enable = static.network.vlan.internet_port_priority = {$yealink_vlan_cos} static.network.vlan.internet_port_vid = {$yealink_vlan_id} - {if isset($yealink_vlan_enable)}static.network.vlan.internet_port_enable = {$yealink_vlan_enable}{else}static.network.vlan.internet_port_enable = 0{/if} +static.network.vlan.pc_port_priority = {$yealink_vlan_pc_cos} +static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id} +{if isset($yealink_vlan_pc_enable)}static.network.vlan.pc_port_enable = {$yealink_vlan_pc_enable}{else}static.network.vlan.pc_port_enable = 0{/if} + ####################################################################################### ## Network VPN ## diff --git a/resources/templates/provision/yealink/t48s/y000000000065.cfg b/resources/templates/provision/yealink/t48s/y000000000065.cfg index 9686548bf3..aa882da81b 100644 --- a/resources/templates/provision/yealink/t48s/y000000000065.cfg +++ b/resources/templates/provision/yealink/t48s/y000000000065.cfg @@ -139,17 +139,15 @@ static.network.lldp.packet_interval = ####################################################################################### static.network.vlan.dhcp_enable = static.network.vlan.dhcp_option = -static.network.vlan.vlan_change.enable = - -static.network.vlan.pc_port_priority = {$yealink_vlan_pc_cos} -static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id} -static.network.vlan.pc_port_enable = static.network.vlan.internet_port_priority = {$yealink_vlan_cos} static.network.vlan.internet_port_vid = {$yealink_vlan_id} - {if isset($yealink_vlan_enable)}static.network.vlan.internet_port_enable = {$yealink_vlan_enable}{else}static.network.vlan.internet_port_enable = 0{/if} +static.network.vlan.pc_port_priority = {$yealink_vlan_pc_cos} +static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id} +{if isset($yealink_vlan_pc_enable)}static.network.vlan.pc_port_enable = {$yealink_vlan_pc_enable}{else}static.network.vlan.pc_port_enable = 0{/if} + ####################################################################################### ## Network VPN ## diff --git a/resources/templates/provision/yealink/t48u/y000000000109.cfg b/resources/templates/provision/yealink/t48u/y000000000109.cfg index 186d373903..4d8659e82c 100644 --- a/resources/templates/provision/yealink/t48u/y000000000109.cfg +++ b/resources/templates/provision/yealink/t48u/y000000000109.cfg @@ -128,18 +128,14 @@ static.network.vlan.dhcp_enable = static.network.vlan.dhcp_option = static.network.vlan.vlan_change.enable = -static.network.vlan.pc_port_priority = {$yealink_vlan_pc_cos} -static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id} - -{if isset($yealink_vlan_pc_enable)}static.network.vlan.pc_port_enable = {$yealink_vlan_pc_enable}{else}static.network.vlan.pc_port_enable = 0{/if} - -#static.network.vlan.pc_port_enable = - static.network.vlan.internet_port_priority = {$yealink_vlan_cos} static.network.vlan.internet_port_vid = {$yealink_vlan_id} - {if isset($yealink_vlan_enable)}static.network.vlan.internet_port_enable = {$yealink_vlan_enable}{else}static.network.vlan.internet_port_enable = 0{/if} +static.network.vlan.pc_port_priority = {$yealink_vlan_pc_cos} +static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id} +{if isset($yealink_vlan_pc_enable)}static.network.vlan.pc_port_enable = {$yealink_vlan_pc_enable}{else}static.network.vlan.pc_port_enable = 0{/if} + ####################################################################################### ## Network VPN ## diff --git a/resources/templates/provision/yealink/t52s/y000000000074.cfg b/resources/templates/provision/yealink/t52s/y000000000074.cfg index ba0ba8e217..9147f36d45 100644 --- a/resources/templates/provision/yealink/t52s/y000000000074.cfg +++ b/resources/templates/provision/yealink/t52s/y000000000074.cfg @@ -100,14 +100,14 @@ static.network.vlan.dhcp_enable = static.network.vlan.dhcp_option = static.network.vlan.vlan_change.enable = -static.network.vlan.pc_port_priority = {$yealink_vlan_pc_cos} -static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id} -static.network.vlan.pc_port_enable = - static.network.vlan.internet_port_priority = {$yealink_vlan_cos} static.network.vlan.internet_port_vid = {$yealink_vlan_id} {if isset($yealink_vlan_enable)}static.network.vlan.internet_port_enable = {$yealink_vlan_enable}{else}static.network.vlan.internet_port_enable = 0{/if} +static.network.vlan.pc_port_priority = {$yealink_vlan_pc_cos} +static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id} +{if isset($yealink_vlan_pc_enable)}static.network.vlan.pc_port_enable = {$yealink_vlan_pc_enable}{else}static.network.vlan.pc_port_enable = 0{/if} + ####################################################################################### ## Network VPN ## diff --git a/resources/templates/provision/yealink/t53/y000000000095.cfg b/resources/templates/provision/yealink/t53/y000000000095.cfg index 518f7fb95f..b6c4384fe4 100644 --- a/resources/templates/provision/yealink/t53/y000000000095.cfg +++ b/resources/templates/provision/yealink/t53/y000000000095.cfg @@ -113,14 +113,14 @@ static.network.vlan.dhcp_enable = static.network.vlan.dhcp_option = static.network.vlan.vlan_change.enable = -static.network.vlan.pc_port_priority = {$yealink_vlan_pc_cos} -static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id} -static.network.vlan.pc_port_enable = - static.network.vlan.internet_port_priority = {$yealink_vlan_cos} static.network.vlan.internet_port_vid = {$yealink_vlan_id} {if isset($yealink_vlan_enable)}static.network.vlan.internet_port_enable = {$yealink_vlan_enable}{else}static.network.vlan.internet_port_enable = 0{/if} +static.network.vlan.pc_port_priority = {$yealink_vlan_pc_cos} +static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id} +{if isset($yealink_vlan_pc_enable)}static.network.vlan.pc_port_enable = {$yealink_vlan_pc_enable}{else}static.network.vlan.pc_port_enable = 0{/if} + ####################################################################################### diff --git a/resources/templates/provision/yealink/t53w/y000000000095.cfg b/resources/templates/provision/yealink/t53w/y000000000095.cfg index 4602fbb3bb..4126e89775 100644 --- a/resources/templates/provision/yealink/t53w/y000000000095.cfg +++ b/resources/templates/provision/yealink/t53w/y000000000095.cfg @@ -113,14 +113,14 @@ static.network.vlan.dhcp_enable = static.network.vlan.dhcp_option = static.network.vlan.vlan_change.enable = -static.network.vlan.pc_port_priority = {$yealink_vlan_pc_cos} -static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id} -static.network.vlan.pc_port_enable = - static.network.vlan.internet_port_priority = {$yealink_vlan_cos} static.network.vlan.internet_port_vid = {$yealink_vlan_id} {if isset($yealink_vlan_enable)}static.network.vlan.internet_port_enable = {$yealink_vlan_enable}{else}static.network.vlan.internet_port_enable = 0{/if} +static.network.vlan.pc_port_priority = {$yealink_vlan_pc_cos} +static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id} +{if isset($yealink_vlan_pc_enable)}static.network.vlan.pc_port_enable = {$yealink_vlan_pc_enable}{else}static.network.vlan.pc_port_enable = 0{/if} + ####################################################################################### diff --git a/resources/templates/provision/yealink/t54s/y000000000070.cfg b/resources/templates/provision/yealink/t54s/y000000000070.cfg index 8dc7a41a3f..922320e8a7 100644 --- a/resources/templates/provision/yealink/t54s/y000000000070.cfg +++ b/resources/templates/provision/yealink/t54s/y000000000070.cfg @@ -100,14 +100,14 @@ static.network.vlan.dhcp_enable = static.network.vlan.dhcp_option = static.network.vlan.vlan_change.enable = -static.network.vlan.pc_port_priority = {$yealink_vlan_pc_cos} -static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id} -static.network.vlan.pc_port_enable = - static.network.vlan.internet_port_priority = {$yealink_vlan_cos} static.network.vlan.internet_port_vid = {$yealink_vlan_id} {if isset($yealink_vlan_enable)}static.network.vlan.internet_port_enable = {$yealink_vlan_enable}{else}static.network.vlan.internet_port_enable = 0{/if} +static.network.vlan.pc_port_priority = {$yealink_vlan_pc_cos} +static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id} +{if isset($yealink_vlan_pc_enable)}static.network.vlan.pc_port_enable = {$yealink_vlan_pc_enable}{else}static.network.vlan.pc_port_enable = 0{/if} + ####################################################################################### ## Network VPN ## diff --git a/resources/templates/provision/yealink/t54w/y000000000096.cfg b/resources/templates/provision/yealink/t54w/y000000000096.cfg index eeb39f44bc..2ee5740d61 100644 --- a/resources/templates/provision/yealink/t54w/y000000000096.cfg +++ b/resources/templates/provision/yealink/t54w/y000000000096.cfg @@ -113,14 +113,13 @@ static.network.vlan.dhcp_enable = static.network.vlan.dhcp_option = static.network.vlan.vlan_change.enable = -static.network.vlan.pc_port_priority = {$yealink_vlan_pc_cos} -static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id} -static.network.vlan.pc_port_enable = - static.network.vlan.internet_port_priority = {$yealink_vlan_cos} static.network.vlan.internet_port_vid = {$yealink_vlan_id} {if isset($yealink_vlan_enable)}static.network.vlan.internet_port_enable = {$yealink_vlan_enable}{else}static.network.vlan.internet_port_enable = 0{/if} +static.network.vlan.pc_port_priority = {$yealink_vlan_pc_cos} +static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id} +{if isset($yealink_vlan_pc_enable)}static.network.vlan.pc_port_enable = {$yealink_vlan_pc_enable}{else}static.network.vlan.pc_port_enable = 0{/if} ####################################################################################### diff --git a/resources/templates/provision/yealink/t56a/y000000000056.cfg b/resources/templates/provision/yealink/t56a/y000000000056.cfg index faa1662d07..70e7f04eae 100644 --- a/resources/templates/provision/yealink/t56a/y000000000056.cfg +++ b/resources/templates/provision/yealink/t56a/y000000000056.cfg @@ -67,13 +67,14 @@ network.dhcp.server_mac2 = ####################################################################################### ## VLAN ## ####################################################################################### -static.network.vlan.internet_port_enable = -{if isset($yealink_vlan_enable)}static.network.vlan.internet_port_enable = {$yealink_vlan_enable}{else}static.network.vlan.internet_port_enable = 0{/if} -static.network.vlan.internet_port_vid = {$yealink_vlan_id} static.network.vlan.internet_port_priority = {$yealink_vlan_cos} -static.network.vlan.pc_port_enable = -static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id} +static.network.vlan.internet_port_vid = {$yealink_vlan_id} +{if isset($yealink_vlan_enable)}static.network.vlan.internet_port_enable = {$yealink_vlan_enable}{else}static.network.vlan.internet_port_enable = 0{/if} + static.network.vlan.pc_port_priority = {$yealink_vlan_pc_cos} +static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id} +{if isset($yealink_vlan_pc_enable)}static.network.vlan.pc_port_enable = {$yealink_vlan_pc_enable}{else}static.network.vlan.pc_port_enable = 0{/if} + static.network.vlan.dhcp_enable = static.network.vlan.dhcp_option = ##It configures LLDP or manually VLAN can't obtain IP, whether to switch to other methods of VLAN or closed VLAN to get IP diff --git a/resources/templates/provision/yealink/t57w/y000000000097.cfg b/resources/templates/provision/yealink/t57w/y000000000097.cfg index dd9e6efbf7..e04e1b462c 100644 --- a/resources/templates/provision/yealink/t57w/y000000000097.cfg +++ b/resources/templates/provision/yealink/t57w/y000000000097.cfg @@ -112,14 +112,13 @@ static.network.vlan.dhcp_enable = static.network.vlan.dhcp_option = static.network.vlan.vlan_change.enable = -static.network.vlan.pc_port_priority = {$yealink_vlan_pc_cos} -static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id} -static.network.vlan.pc_port_enable = - static.network.vlan.internet_port_priority = {$yealink_vlan_cos} static.network.vlan.internet_port_vid = {$yealink_vlan_id} {if isset($yealink_vlan_enable)}static.network.vlan.internet_port_enable = {$yealink_vlan_enable}{else}static.network.vlan.internet_port_enable = 0{/if} +static.network.vlan.pc_port_priority = {$yealink_vlan_pc_cos} +static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id} +{if isset($yealink_vlan_pc_enable)}static.network.vlan.pc_port_enable = {$yealink_vlan_pc_enable}{else}static.network.vlan.pc_port_enable = 0{/if} ####################################################################################### diff --git a/resources/templates/provision/yealink/t58a/y000000000058.cfg b/resources/templates/provision/yealink/t58a/y000000000058.cfg index 21c2d7927c..85176bfa1d 100644 --- a/resources/templates/provision/yealink/t58a/y000000000058.cfg +++ b/resources/templates/provision/yealink/t58a/y000000000058.cfg @@ -67,16 +67,15 @@ network.dhcp.server_mac2 = ####################################################################################### ## VLAN ## ####################################################################################### -{if isset($yealink_vlan_enable)} -static.network.vlan.internet_port_enable = {$yealink_vlan_enable} -{else} -static.network.vlan.internet_port_enable = 0 -{/if} -static.network.vlan.internet_port_vid = {$yealink_vlan_id} + static.network.vlan.internet_port_priority = {$yealink_vlan_cos} -static.network.vlan.pc_port_enable = -static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id} +static.network.vlan.internet_port_vid = {$yealink_vlan_id} +{if isset($yealink_vlan_enable)}static.network.vlan.internet_port_enable = {$yealink_vlan_enable}{else}static.network.vlan.internet_port_enable = 0{/if} + static.network.vlan.pc_port_priority = {$yealink_vlan_pc_cos} +static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id} +{if isset($yealink_vlan_pc_enable)}static.network.vlan.pc_port_enable = {$yealink_vlan_pc_enable}{else}static.network.vlan.pc_port_enable = 0{/if} + static.network.vlan.dhcp_enable = static.network.vlan.dhcp_option = ##It configures LLDP or manually VLAN can't obtain IP, whether to switch to other methods of VLAN or closed VLAN to get IP diff --git a/resources/templates/provision/yealink/t58v/y000000000058.cfg b/resources/templates/provision/yealink/t58v/y000000000058.cfg index 4b0630157c..2cbd2a0771 100644 --- a/resources/templates/provision/yealink/t58v/y000000000058.cfg +++ b/resources/templates/provision/yealink/t58v/y000000000058.cfg @@ -67,13 +67,15 @@ network.dhcp.server_mac2 = ####################################################################################### ## VLAN ## ####################################################################################### -static.network.vlan.internet_port_enable = -{if isset($yealink_vlan_enable)}static.network.vlan.internet_port_enable = {$yealink_vlan_enable}{else}static.network.vlan.internet_port_enable = 0{/if} -static.network.vlan.internet_port_vid = {$yealink_vlan_id} + static.network.vlan.internet_port_priority = {$yealink_vlan_cos} -static.network.vlan.pc_port_enable = -static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id} +static.network.vlan.internet_port_vid = {$yealink_vlan_id} +{if isset($yealink_vlan_enable)}static.network.vlan.internet_port_enable = {$yealink_vlan_enable}{else}static.network.vlan.internet_port_enable = 0{/if} + static.network.vlan.pc_port_priority = {$yealink_vlan_pc_cos} +static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id} +{if isset($yealink_vlan_pc_enable)}static.network.vlan.pc_port_enable = {$yealink_vlan_pc_enable}{else}static.network.vlan.pc_port_enable = 0{/if} + static.network.vlan.dhcp_enable = static.network.vlan.dhcp_option = ##It configures LLDP or manually VLAN can't obtain IP, whether to switch to other methods of VLAN or closed VLAN to get IP diff --git a/resources/templates/provision/yealink/t58w/y000000000150.cfg b/resources/templates/provision/yealink/t58w/y000000000150.cfg index 6c3f0b09dd..a7621b3d2d 100644 --- a/resources/templates/provision/yealink/t58w/y000000000150.cfg +++ b/resources/templates/provision/yealink/t58w/y000000000150.cfg @@ -100,15 +100,15 @@ static.network.dns.query_timeout = ####################################################################################### ## VLAN ## ####################################################################################### -static.network.vlan.internet_port_enable = -static.network.vlan.internet_port_vid = {$yealink_vlan_pc_id} + static.network.vlan.internet_port_priority = {$yealink_vlan_cos} -static.network.vlan.pc_port_enable = -static.network.vlan.pc_port_vid = {$yealink_vlan_id} +static.network.vlan.internet_port_vid = {$yealink_vlan_id} {if isset($yealink_vlan_enable)}static.network.vlan.internet_port_enable = {$yealink_vlan_enable}{else}static.network.vlan.internet_port_enable = 0{/if} + static.network.vlan.pc_port_priority = {$yealink_vlan_pc_cos} -static.network.vlan.dhcp_enable = -static.network.vlan.dhcp_option = +static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id} +{if isset($yealink_vlan_pc_enable)}static.network.vlan.pc_port_enable = {$yealink_vlan_pc_enable}{else}static.network.vlan.pc_port_enable = 0{/if} + ##It configures LLDP or manually VLAN can't obtain IP, whether to switch to other methods of VLAN or closed VLAN to get IP ##(Except T19P/T21P Models) 0-Disable 1-Enable static.network.vlan.vlan_change.enable = diff --git a/resources/templates/provision/yealink/vp530/y000000000023.cfg b/resources/templates/provision/yealink/vp530/y000000000023.cfg index 709441088e..9cb3f1cdcc 100644 --- a/resources/templates/provision/yealink/vp530/y000000000023.cfg +++ b/resources/templates/provision/yealink/vp530/y000000000023.cfg @@ -25,15 +25,15 @@ network.pppoe.password = #Enable or disable the VLAN of WAN port; 0-Disabled(default), 1-Enabled; #Require reboot; -network.vlan.internet_port_enable = +{if isset($yealink_vlan_enable)}network.vlan.internet_port_enable = {$yealink_vlan_enable}{else}network.network.vlan.internet_port_enable = 0{/if} #Configure the VLAN ID, it ranges from 1 to 4094, the default value is 1. #Require reboot; -network.vlan.internet_port_vid = +network.vlan.internet_port_vid = {$yealink_vlan_id} #Configure the VLAN priority, it ranges from 0 (default) to 7. #Require reboot; -network.vlan.internet_port_priority = +network.vlan.internet_port_priority = {$yealink_vlan_cos} #Configure the HTTP port (80 by default) and the HTTPS port (443 by default) of the web server. Both range from 1 to 65535. #Require reboot; diff --git a/resources/templates/provision/yealink/vp59/y000000000091.cfg b/resources/templates/provision/yealink/vp59/y000000000091.cfg index 62325a72a8..b094ae2572 100644 --- a/resources/templates/provision/yealink/vp59/y000000000091.cfg +++ b/resources/templates/provision/yealink/vp59/y000000000091.cfg @@ -83,12 +83,15 @@ static.network.dns.query_timeout = ####################################################################################### ## VLAN ## ####################################################################################### -static.network.vlan.internet_port_enable = -static.network.vlan.internet_port_vid = -static.network.vlan.internet_port_priority = -static.network.vlan.pc_port_enable = -static.network.vlan.pc_port_vid = -static.network.vlan.pc_port_priority = + +static.network.vlan.internet_port_priority = {$yealink_vlan_cos} +static.network.vlan.internet_port_vid = {$yealink_vlan_id} +{if isset($yealink_vlan_enable)}static.network.vlan.internet_port_enable = {$yealink_vlan_enable}{else}static.network.vlan.internet_port_enable = 0{/if} + +static.network.vlan.pc_port_priority = {$yealink_vlan_pc_cos} +static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id} +{if isset($yealink_vlan_pc_enable)}static.network.vlan.pc_port_enable = {$yealink_vlan_pc_enable}{else}static.network.vlan.pc_port_enable = 0{/if} + static.network.vlan.dhcp_enable = static.network.vlan.dhcp_option = ##It configures LLDP or manually VLAN can't obtain IP, whether to switch to other methods of VLAN or closed VLAN to get IP diff --git a/resources/templates/provision/yealink/w52p/y000000000025.cfg b/resources/templates/provision/yealink/w52p/y000000000025.cfg index 9e7d892e46..7c3444b981 100644 --- a/resources/templates/provision/yealink/w52p/y000000000025.cfg +++ b/resources/templates/provision/yealink/w52p/y000000000025.cfg @@ -24,15 +24,15 @@ network.pppoe.password = #Enable or disable the VLAN of WAN port; 0-Disabled(default), 1-Enabled; #Require reboot; -network.vlan.internet_port_enable = 0 +{if isset($yealink_vlan_enable)}network.vlan.internet_port_enable = {$yealink_vlan_enable}{else}network.vlan.internet_port_enable = 0{/if} #Configure the VLAN ID, it ranges from 1 to 4094, the default value is 1. #Require reboot; -network.vlan.internet_port_vid = +network.vlan.internet_port_vid = {$yealink_vlan_id} #Configure the VLAN priority, it ranges from 0 (default) to 7. #Require reboot; -network.vlan.internet_port_priority = +network.vlan.internet_port_priority = {$yealink_vlan_cos} #Enable or disable the DHCP to obtain the information of the VLAN; 0-Disabled; 1-Enabled (default); #Require reboot; diff --git a/resources/templates/provision/yealink/w56p/y000000000025.cfg b/resources/templates/provision/yealink/w56p/y000000000025.cfg index b663a69d2c..3966b3f910 100644 --- a/resources/templates/provision/yealink/w56p/y000000000025.cfg +++ b/resources/templates/provision/yealink/w56p/y000000000025.cfg @@ -24,15 +24,16 @@ network.pppoe.password = #Enable or disable the VLAN of WAN port; 0-Disabled(default), 1-Enabled; #Require reboot; -network.vlan.internet_port_enable = 0 +{if isset($yealink_vlan_enable)}network.vlan.internet_port_enable = {$yealink_vlan_enable}{else}network.vlan.internet_port_enable = 0{/if} + #Configure the VLAN ID, it ranges from 1 to 4094, the default value is 1. #Require reboot; -network.vlan.internet_port_vid = +network.vlan.internet_port_vid = {$yealink_vlan_id} #Configure the VLAN priority, it ranges from 0 (default) to 7. #Require reboot; -network.vlan.internet_port_priority = +network.vlan.internet_port_priority = {$yealink_vlan_cos} #Enable or disable the DHCP to obtain the information of the VLAN; 0-Disabled; 1-Enabled (default); #Require reboot; diff --git a/resources/templates/provision/yealink/w60b/y000000000077.cfg b/resources/templates/provision/yealink/w60b/y000000000077.cfg index 06704e0b89..87b3e3fad2 100644 --- a/resources/templates/provision/yealink/w60b/y000000000077.cfg +++ b/resources/templates/provision/yealink/w60b/y000000000077.cfg @@ -32,7 +32,7 @@ network.vlan.internet_port_vid = {$yealink_vlan_id} #Configure the VLAN priority, it ranges from 0 (default) to 7. #Require reboot; -network.vlan.internet_port_priority = +network.vlan.internet_port_priority = {$yealink_vlan_cos} #Enable or disable the DHCP to obtain the information of the VLAN; 0-Disabled; 1-Enabled (default); #Require reboot; diff --git a/resources/templates/provision/yealink/w70b/y000000000146.cfg b/resources/templates/provision/yealink/w70b/y000000000146.cfg index 365320d8d6..0e9c24060e 100644 --- a/resources/templates/provision/yealink/w70b/y000000000146.cfg +++ b/resources/templates/provision/yealink/w70b/y000000000146.cfg @@ -32,7 +32,8 @@ network.vlan.internet_port_vid = {$yealink_vlan_id} #Configure the VLAN priority, it ranges from 0 (default) to 7. #Require reboot; -network.vlan.internet_port_priority = +network.vlan.internet_port_priority = {$yealink_vlan_cos} + #Enable or disable the DHCP to obtain the information of the VLAN; 0-Disabled; 1-Enabled (default); #Require reboot; diff --git a/resources/templates/provision/yealink/w7xp/y000000000146.cfg b/resources/templates/provision/yealink/w7xp/y000000000146.cfg index 05caac9948..cb09ab19ed 100644 --- a/resources/templates/provision/yealink/w7xp/y000000000146.cfg +++ b/resources/templates/provision/yealink/w7xp/y000000000146.cfg @@ -24,7 +24,7 @@ network.pppoe.password = #Enable or disable the VLAN of WAN port; 0-Disabled(default), 1-Enabled; #Require reboot; -network.vlan.internet_port_enable = {$yealink_vlan_enable} +{if isset($yealink_vlan_enable)}network.vlan.internet_port_enable = {$yealink_vlan_enable}{else}network.vlan.internet_port_enable = 0{/if} #Configure the VLAN ID, it ranges from 1 to 4094, the default value is 1. #Require reboot; @@ -32,7 +32,7 @@ network.vlan.internet_port_vid = {$yealink_vlan_id} #Configure the VLAN priority, it ranges from 0 (default) to 7. #Require reboot; -network.vlan.internet_port_priority = +network.vlan.internet_port_priority = {$yealink_vlan_cos} #Enable or disable the DHCP to obtain the information of the VLAN; 0-Disabled; 1-Enabled (default); #Require reboot;