diff --git a/.gitignore b/.gitignore
index 6fa1c8cb93..a15bd5f2d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@
resources/config.php
secure/mailto.bat
secure/*.db
-secure/*.sqlite
\ No newline at end of file
+secure/*.sqlite
+.DS_Store
diff --git a/resources/templates/provision/linksys/spa942/{$mac}.xml b/resources/templates/provision/linksys/spa942/{$mac}.xml
index 2bbed0be7d..805b4bceb9 100644
--- a/resources/templates/provision/linksys/spa942/{$mac}.xml
+++ b/resources/templates/provision/linksys/spa942/{$mac}.xml
@@ -2,7 +2,7 @@
Yes
80
Yes
-$adminpassword
+{$admin_password}
DHCP
@@ -13,15 +13,15 @@
-
-
-Manual
+{$dns_server_primary}
+{$dns_server_secondary}
+DHCP,Manual
Parallel
0
-uk.pool.ntp.org
-
+{$ntp_server_primary}
+{$ntp_server_secondary}
No
Yes
1
diff --git a/resources/templates/provision/yealink/cp860/y000000000037.cfg b/resources/templates/provision/yealink/cp860/y000000000037.cfg
index f8f93a00f5..dad1e3d76b 100644
--- a/resources/templates/provision/yealink/cp860/y000000000037.cfg
+++ b/resources/templates/provision/yealink/cp860/y000000000037.cfg
@@ -7,6 +7,18 @@
#######################################################################################
network.dhcp_host_name =
+#Configure the WAN port type; 0-DHCP(default), 1-PPPoE, 2-Static IP Address;
+#Require reboot;
+network.internet_port.type =
+
+#Configure the static IP address, submask, gateway and DNS server.
+#Require reboot;
+network.internet_port.ip =
+network.internet_port.mask =
+network.internet_port.gateway =
+network.primary_dns = {$dns_server_primary}
+network.secondary_dns = {$dns_server_secondary}
+
#######################################################################################
## PPPOE ##
#######################################################################################
@@ -24,7 +36,7 @@ network.internet_port.speed_duplex =
network.pc_port.speed_duplex =
network.pc_port.dhcp_server = 1
-network.static_dns_enable = 1
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
{if isset($vlan_port_id) }
#######################################################################################
@@ -565,7 +577,7 @@ remote_phonebook.data.1.name = Users
{if isset($yealink_remote_phonebook_1_url) }
remote_phonebook.data.1.url = {$yealink_remote_phonebook_1_url}
{else}
-remote_phonebook.data.1.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=users
+remote_phonebook.data.1.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=users
{/if}
{if isset($yealink_remote_phonebook_2_name) }
@@ -576,7 +588,7 @@ remote_phonebook.data.2.name = Groups
{if isset($yealink_remote_phonebook_2_url) }
remote_phonebook.data.2.url = {$yealink_remote_phonebook_2_url}
{else}
-remote_phonebook.data.2.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+remote_phonebook.data.2.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=groups
{/if}
{if isset($yealink_remote_phonebook_3_name) }
@@ -587,7 +599,7 @@ remote_phonebook.data.3.name = Extensions
{if isset($yealink_remote_phonebook_3_url) }
remote_phonebook.data.3.url = {$yealink_remote_phonebook_3_url}
{else}
-remote_phonebook.data.3.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+remote_phonebook.data.3.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
{/if}
remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
@@ -1571,7 +1583,7 @@ super_search.url =
## Directory Setting ##
#######################################################################################
#Configure the access URL of the directory setting file.
-directory_setting.url = {$yealink_directory_setting_url}
+directory_setting.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=favorite_setting.xml
#######################################################################################
## Configure the access URL of firmware ##
diff --git a/resources/templates/provision/yealink/t20p/y000000000007.cfg b/resources/templates/provision/yealink/t20p/y000000000007.cfg
index 8c00d11a90..dc9de996d7 100644
--- a/resources/templates/provision/yealink/t20p/y000000000007.cfg
+++ b/resources/templates/provision/yealink/t20p/y000000000007.cfg
@@ -15,8 +15,8 @@ network.internet_port.type =
network.internet_port.ip =
network.internet_port.mask =
network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+network.primary_dns= {$dns_server_primary}
+network.secondary_dns = {$dns_server_secondary}
#Configure the username and password for PPPOE connection.
#Require reboot;
@@ -112,7 +112,7 @@ network.lldp.packet_interval =
#Enable or disable the phone to obtain DNS from DHCP; 0-Disabled, 1-Enabled (default);
#Require reboot;
-network.static_dns_enable =
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
#######################################################################################
## Syslog Server ##
@@ -921,7 +921,7 @@ remote_phonebook.data.1.name = Users
{if isset($yealink_remote_phonebook_1_url) }
remote_phonebook.data.1.url = {$yealink_remote_phonebook_1_url}
{else}
-remote_phonebook.data.1.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=users
+remote_phonebook.data.1.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=users
{/if}
{if isset($yealink_remote_phonebook_2_name) }
@@ -932,7 +932,7 @@ remote_phonebook.data.2.name = Groups
{if isset($yealink_remote_phonebook_2_url) }
remote_phonebook.data.2.url = {$yealink_remote_phonebook_2_url}
{else}
-remote_phonebook.data.2.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+remote_phonebook.data.2.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=groups
{/if}
{if isset($yealink_remote_phonebook_3_name) }
@@ -943,7 +943,7 @@ remote_phonebook.data.3.name = Extensions
{if isset($yealink_remote_phonebook_3_url) }
remote_phonebook.data.3.url = {$yealink_remote_phonebook_3_url}
{else}
-remote_phonebook.data.3.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+remote_phonebook.data.3.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
{/if}
remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
@@ -1241,7 +1241,7 @@ super_search.url =
## Directory Setting ##
#######################################################################################
#Configure the access URL of the directory setting file.
-directory_setting.url = {$yealink_directory_setting_url}
+directory_setting.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=favorite_setting.xml
#######################################################################################
## Configure the access URL of the Wallpaper ##
diff --git a/resources/templates/provision/yealink/t21p/y000000000052.cfg b/resources/templates/provision/yealink/t21p/y000000000052.cfg
index d30252a234..24db2b1cc5 100644
--- a/resources/templates/provision/yealink/t21p/y000000000052.cfg
+++ b/resources/templates/provision/yealink/t21p/y000000000052.cfg
@@ -7,6 +7,18 @@
#######################################################################################
network.dhcp_host_name =
+#Configure the WAN port type; 0-DHCP(default), 1-PPPoE, 2-Static IP Address;
+#Require reboot;
+network.internet_port.type =
+
+#Configure the static IP address, submask, gateway and DNS server.
+#Require reboot;
+network.internet_port.ip =
+network.internet_port.mask =
+network.internet_port.gateway =
+network.primary_dns = {$dns_server_primary}
+network.secondary_dns = {$dns_server_secondary}
+
#######################################################################################
## PPPOE ##
#######################################################################################
@@ -24,7 +36,7 @@ network.internet_port.speed_duplex =
network.pc_port.speed_duplex =
network.pc_port.dhcp_server = 1
-network.static_dns_enable = 0
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
#######################################################################################
## VLAN ##
@@ -525,7 +537,7 @@ remote_phonebook.data.1.name = Users
{if isset($yealink_remote_phonebook_1_url) }
remote_phonebook.data.1.url = {$yealink_remote_phonebook_1_url}
{else}
-remote_phonebook.data.1.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=users
+remote_phonebook.data.1.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=users
{/if}
{if isset($yealink_remote_phonebook_2_name) }
@@ -536,7 +548,7 @@ remote_phonebook.data.2.name = Groups
{if isset($yealink_remote_phonebook_2_url) }
remote_phonebook.data.2.url = {$yealink_remote_phonebook_2_url}
{else}
-remote_phonebook.data.2.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+remote_phonebook.data.2.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=groups
{/if}
{if isset($yealink_remote_phonebook_3_name) }
@@ -547,7 +559,7 @@ remote_phonebook.data.3.name = Extensions
{if isset($yealink_remote_phonebook_3_url) }
remote_phonebook.data.3.url = {$yealink_remote_phonebook_3_url}
{else}
-remote_phonebook.data.3.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+remote_phonebook.data.3.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
{/if}
remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
@@ -1532,7 +1544,7 @@ super_search.url =
## Directory Setting ##
#######################################################################################
#Configure the access URL of the directory setting file.
-directory_setting.url = {$yealink_directory_setting_url}
+directory_setting.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=favorite_setting.xml
#######################################################################################
## Configure the access URL of firmware ##
diff --git a/resources/templates/provision/yealink/t22p/y000000000005.cfg b/resources/templates/provision/yealink/t22p/y000000000005.cfg
index 263a11e0c0..bae46586b4 100644
--- a/resources/templates/provision/yealink/t22p/y000000000005.cfg
+++ b/resources/templates/provision/yealink/t22p/y000000000005.cfg
@@ -15,8 +15,8 @@ network.internet_port.type =
network.internet_port.ip =
network.internet_port.mask =
network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+network.primary_dns= {$dns_server_primary}
+network.secondary_dns = {$dns_server_secondary}
#Configure the username and password for PPPOE connection.
#Require reboot;
@@ -112,7 +112,7 @@ network.lldp.packet_interval =
#Enable or disable the phone to obtain DNS from DHCP; 0-Disabled, 1-Enabled (default);
#Require reboot;
-network.static_dns_enable =
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
#######################################################################################
## Syslog Server ##
@@ -921,7 +921,7 @@ remote_phonebook.data.1.name = Users
{if isset($yealink_remote_phonebook_1_url) }
remote_phonebook.data.1.url = {$yealink_remote_phonebook_1_url}
{else}
-remote_phonebook.data.1.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=users
+remote_phonebook.data.1.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=users
{/if}
{if isset($yealink_remote_phonebook_2_name) }
@@ -932,7 +932,7 @@ remote_phonebook.data.2.name = Groups
{if isset($yealink_remote_phonebook_2_url) }
remote_phonebook.data.2.url = {$yealink_remote_phonebook_2_url}
{else}
-remote_phonebook.data.2.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+remote_phonebook.data.2.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=groups
{/if}
{if isset($yealink_remote_phonebook_3_name) }
@@ -943,7 +943,7 @@ remote_phonebook.data.3.name = Extensions
{if isset($yealink_remote_phonebook_3_url) }
remote_phonebook.data.3.url = {$yealink_remote_phonebook_3_url}
{else}
-remote_phonebook.data.3.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+remote_phonebook.data.3.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
{/if}
remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
@@ -1175,7 +1175,7 @@ phone_setting.hold_power_led_flash_enable =
## Directory Setting ##
#######################################################################################
#Configure the access URL of the directory setting file.
-directory_setting.url = {$yealink_directory_setting_url}
+directory_setting.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=favorite_setting.xml
#######################################################################################
## Configure the access URL of firmware ##
diff --git a/resources/templates/provision/yealink/t22p/{$mac}.cfg b/resources/templates/provision/yealink/t22p/{$mac}.cfg
index b3304df199..65b891ed22 100644
--- a/resources/templates/provision/yealink/t22p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t22p/{$mac}.cfg
@@ -252,7 +252,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 =
@@ -569,7 +569,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 =
@@ -886,7 +886,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 =
@@ -1204,7 +1204,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 =
@@ -1522,7 +1522,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 =
@@ -1837,7 +1837,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/t23g/y000000000044.cfg b/resources/templates/provision/yealink/t23g/y000000000044.cfg
index d30252a234..24db2b1cc5 100644
--- a/resources/templates/provision/yealink/t23g/y000000000044.cfg
+++ b/resources/templates/provision/yealink/t23g/y000000000044.cfg
@@ -7,6 +7,18 @@
#######################################################################################
network.dhcp_host_name =
+#Configure the WAN port type; 0-DHCP(default), 1-PPPoE, 2-Static IP Address;
+#Require reboot;
+network.internet_port.type =
+
+#Configure the static IP address, submask, gateway and DNS server.
+#Require reboot;
+network.internet_port.ip =
+network.internet_port.mask =
+network.internet_port.gateway =
+network.primary_dns = {$dns_server_primary}
+network.secondary_dns = {$dns_server_secondary}
+
#######################################################################################
## PPPOE ##
#######################################################################################
@@ -24,7 +36,7 @@ network.internet_port.speed_duplex =
network.pc_port.speed_duplex =
network.pc_port.dhcp_server = 1
-network.static_dns_enable = 0
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
#######################################################################################
## VLAN ##
@@ -525,7 +537,7 @@ remote_phonebook.data.1.name = Users
{if isset($yealink_remote_phonebook_1_url) }
remote_phonebook.data.1.url = {$yealink_remote_phonebook_1_url}
{else}
-remote_phonebook.data.1.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=users
+remote_phonebook.data.1.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=users
{/if}
{if isset($yealink_remote_phonebook_2_name) }
@@ -536,7 +548,7 @@ remote_phonebook.data.2.name = Groups
{if isset($yealink_remote_phonebook_2_url) }
remote_phonebook.data.2.url = {$yealink_remote_phonebook_2_url}
{else}
-remote_phonebook.data.2.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+remote_phonebook.data.2.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=groups
{/if}
{if isset($yealink_remote_phonebook_3_name) }
@@ -547,7 +559,7 @@ remote_phonebook.data.3.name = Extensions
{if isset($yealink_remote_phonebook_3_url) }
remote_phonebook.data.3.url = {$yealink_remote_phonebook_3_url}
{else}
-remote_phonebook.data.3.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+remote_phonebook.data.3.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
{/if}
remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
@@ -1532,7 +1544,7 @@ super_search.url =
## Directory Setting ##
#######################################################################################
#Configure the access URL of the directory setting file.
-directory_setting.url = {$yealink_directory_setting_url}
+directory_setting.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=favorite_setting.xml
#######################################################################################
## Configure the access URL of firmware ##
diff --git a/resources/templates/provision/yealink/t23p/y000000000044.cfg b/resources/templates/provision/yealink/t23p/y000000000044.cfg
index d30252a234..24db2b1cc5 100644
--- a/resources/templates/provision/yealink/t23p/y000000000044.cfg
+++ b/resources/templates/provision/yealink/t23p/y000000000044.cfg
@@ -7,6 +7,18 @@
#######################################################################################
network.dhcp_host_name =
+#Configure the WAN port type; 0-DHCP(default), 1-PPPoE, 2-Static IP Address;
+#Require reboot;
+network.internet_port.type =
+
+#Configure the static IP address, submask, gateway and DNS server.
+#Require reboot;
+network.internet_port.ip =
+network.internet_port.mask =
+network.internet_port.gateway =
+network.primary_dns = {$dns_server_primary}
+network.secondary_dns = {$dns_server_secondary}
+
#######################################################################################
## PPPOE ##
#######################################################################################
@@ -24,7 +36,7 @@ network.internet_port.speed_duplex =
network.pc_port.speed_duplex =
network.pc_port.dhcp_server = 1
-network.static_dns_enable = 0
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
#######################################################################################
## VLAN ##
@@ -525,7 +537,7 @@ remote_phonebook.data.1.name = Users
{if isset($yealink_remote_phonebook_1_url) }
remote_phonebook.data.1.url = {$yealink_remote_phonebook_1_url}
{else}
-remote_phonebook.data.1.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=users
+remote_phonebook.data.1.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=users
{/if}
{if isset($yealink_remote_phonebook_2_name) }
@@ -536,7 +548,7 @@ remote_phonebook.data.2.name = Groups
{if isset($yealink_remote_phonebook_2_url) }
remote_phonebook.data.2.url = {$yealink_remote_phonebook_2_url}
{else}
-remote_phonebook.data.2.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+remote_phonebook.data.2.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=groups
{/if}
{if isset($yealink_remote_phonebook_3_name) }
@@ -547,7 +559,7 @@ remote_phonebook.data.3.name = Extensions
{if isset($yealink_remote_phonebook_3_url) }
remote_phonebook.data.3.url = {$yealink_remote_phonebook_3_url}
{else}
-remote_phonebook.data.3.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+remote_phonebook.data.3.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
{/if}
remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
@@ -1532,7 +1544,7 @@ super_search.url =
## Directory Setting ##
#######################################################################################
#Configure the access URL of the directory setting file.
-directory_setting.url = {$yealink_directory_setting_url}
+directory_setting.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=favorite_setting.xml
#######################################################################################
## Configure the access URL of firmware ##
diff --git a/resources/templates/provision/yealink/t26p/y000000000004.cfg b/resources/templates/provision/yealink/t26p/y000000000004.cfg
index b02b0e8048..7b659bf7fa 100644
--- a/resources/templates/provision/yealink/t26p/y000000000004.cfg
+++ b/resources/templates/provision/yealink/t26p/y000000000004.cfg
@@ -15,8 +15,8 @@ network.internet_port.type =
network.internet_port.ip =
network.internet_port.mask =
network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+network.primary_dns= {$dns_server_primary}
+network.secondary_dns = {$dns_server_secondary}
#Configure the username and password for PPPOE connection.
#Require reboot;
@@ -112,7 +112,7 @@ network.lldp.packet_interval =
#Enable or disable the phone to obtain DNS from DHCP; 0-Disabled, 1-Enabled (default);
#Require reboot;
-network.static_dns_enable =
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
#######################################################################################
## Syslog Server ##
@@ -921,7 +921,7 @@ remote_phonebook.data.1.name = Users
{if isset($yealink_remote_phonebook_1_url) }
remote_phonebook.data.1.url = {$yealink_remote_phonebook_1_url}
{else}
-remote_phonebook.data.1.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=users
+remote_phonebook.data.1.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=users
{/if}
{if isset($yealink_remote_phonebook_2_name) }
@@ -932,7 +932,7 @@ remote_phonebook.data.2.name = Groups
{if isset($yealink_remote_phonebook_2_url) }
remote_phonebook.data.2.url = {$yealink_remote_phonebook_2_url}
{else}
-remote_phonebook.data.2.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+remote_phonebook.data.2.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=groups
{/if}
{if isset($yealink_remote_phonebook_3_name) }
@@ -943,7 +943,7 @@ remote_phonebook.data.3.name = Extensions
{if isset($yealink_remote_phonebook_3_url) }
remote_phonebook.data.3.url = {$yealink_remote_phonebook_3_url}
{else}
-remote_phonebook.data.3.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+remote_phonebook.data.3.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
{/if}
remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
@@ -1239,7 +1239,7 @@ super_search.url =
## Directory Setting ##
#######################################################################################
#Configure the access URL of the directory setting file.
-directory_setting.url = {$yealink_directory_setting_url}
+directory_setting.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=favorite_setting.xml
#######################################################################################
## Configure the access URL of the Wallpaper ##
diff --git a/resources/templates/provision/yealink/t27p/y000000000045.cfg b/resources/templates/provision/yealink/t27p/y000000000045.cfg
index ac3b29256e..e18f2d4f26 100644
--- a/resources/templates/provision/yealink/t27p/y000000000045.cfg
+++ b/resources/templates/provision/yealink/t27p/y000000000045.cfg
@@ -7,6 +7,18 @@
#######################################################################################
network.dhcp_host_name =
+#Configure the WAN port type; 0-DHCP(default), 1-PPPoE, 2-Static IP Address;
+#Require reboot;
+network.internet_port.type =
+
+#Configure the static IP address, submask, gateway and DNS server.
+#Require reboot;
+network.internet_port.ip =
+network.internet_port.mask =
+network.internet_port.gateway =
+network.primary_dns = {$dns_server_primary}
+network.secondary_dns = {$dns_server_secondary}
+
#######################################################################################
## PPPOE ##
#######################################################################################
@@ -24,7 +36,7 @@ network.internet_port.speed_duplex =
network.pc_port.speed_duplex =
network.pc_port.dhcp_server = 1
-network.static_dns_enable = 0
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
#######################################################################################
## VLAN ##
@@ -525,7 +537,7 @@ remote_phonebook.data.1.name = Users
{if isset($yealink_remote_phonebook_1_url) }
remote_phonebook.data.1.url = {$yealink_remote_phonebook_1_url}
{else}
-remote_phonebook.data.1.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=users
+remote_phonebook.data.1.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=users
{/if}
{if isset($yealink_remote_phonebook_2_name) }
@@ -536,7 +548,7 @@ remote_phonebook.data.2.name = Groups
{if isset($yealink_remote_phonebook_2_url) }
remote_phonebook.data.2.url = {$yealink_remote_phonebook_2_url}
{else}
-remote_phonebook.data.2.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+remote_phonebook.data.2.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=groups
{/if}
{if isset($yealink_remote_phonebook_3_name) }
@@ -547,7 +559,7 @@ remote_phonebook.data.3.name = Extensions
{if isset($yealink_remote_phonebook_3_url) }
remote_phonebook.data.3.url = {$yealink_remote_phonebook_3_url}
{else}
-remote_phonebook.data.3.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+remote_phonebook.data.3.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
{/if}
remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
@@ -1532,7 +1544,7 @@ super_search.url =
## Directory Setting ##
#######################################################################################
#Configure the access URL of the directory setting file.
-directory_setting.url = {$yealink_directory_setting_url}
+directory_setting.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=favorite_setting.xml
#######################################################################################
## Configure the access URL of firmware ##
diff --git a/resources/templates/provision/yealink/t28p/y000000000000.cfg b/resources/templates/provision/yealink/t28p/y000000000000.cfg
index cdc469c231..fda08f0ba2 100644
--- a/resources/templates/provision/yealink/t28p/y000000000000.cfg
+++ b/resources/templates/provision/yealink/t28p/y000000000000.cfg
@@ -15,8 +15,8 @@ network.internet_port.type =
network.internet_port.ip =
network.internet_port.mask =
network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+network.primary_dns= {$dns_server_primary}
+network.secondary_dns = {$dns_server_secondary}
#Configure the username and password for PPPOE connection.
#Require reboot;
@@ -112,7 +112,7 @@ network.lldp.packet_interval =
#Enable or disable the phone to obtain DNS from DHCP; 0-Disabled, 1-Enabled (default);
#Require reboot;
-network.static_dns_enable =
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
#######################################################################################
## Syslog Server ##
@@ -921,7 +921,7 @@ remote_phonebook.data.1.name = Users
{if isset($yealink_remote_phonebook_1_url) }
remote_phonebook.data.1.url = {$yealink_remote_phonebook_1_url}
{else}
-remote_phonebook.data.1.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=users
+remote_phonebook.data.1.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=users
{/if}
{if isset($yealink_remote_phonebook_2_name) }
@@ -932,7 +932,7 @@ remote_phonebook.data.2.name = Groups
{if isset($yealink_remote_phonebook_2_url) }
remote_phonebook.data.2.url = {$yealink_remote_phonebook_2_url}
{else}
-remote_phonebook.data.2.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+remote_phonebook.data.2.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=groups
{/if}
{if isset($yealink_remote_phonebook_3_name) }
@@ -943,7 +943,7 @@ remote_phonebook.data.3.name = Extensions
{if isset($yealink_remote_phonebook_3_url) }
remote_phonebook.data.3.url = {$yealink_remote_phonebook_3_url}
{else}
-remote_phonebook.data.3.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+remote_phonebook.data.3.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
{/if}
remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
@@ -1241,7 +1241,7 @@ super_search.url =
## Directory Setting ##
#######################################################################################
#Configure the access URL of the directory setting file.
-directory_setting.url = {$yealink_directory_setting_url}
+directory_setting.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=favorite_setting.xml
#######################################################################################
## Configure the access URL of the Wallpaper ##
diff --git a/resources/templates/provision/yealink/t29g/y000000000046.cfg b/resources/templates/provision/yealink/t29g/y000000000046.cfg
index d3ae8cf0c6..07c58a1844 100644
--- a/resources/templates/provision/yealink/t29g/y000000000046.cfg
+++ b/resources/templates/provision/yealink/t29g/y000000000046.cfg
@@ -7,6 +7,18 @@
#######################################################################################
network.dhcp_host_name =
+#Configure the WAN port type; 0-DHCP(default), 1-PPPoE, 2-Static IP Address;
+#Require reboot;
+network.internet_port.type =
+
+#Configure the static IP address, submask, gateway and DNS server.
+#Require reboot;
+network.internet_port.ip =
+network.internet_port.mask =
+network.internet_port.gateway =
+network.primary_dns = {$dns_server_primary}
+network.secondary_dns = {$dns_server_secondary}
+
#######################################################################################
## PPPOE ##
#######################################################################################
@@ -24,7 +36,7 @@ network.internet_port.speed_duplex =
network.pc_port.speed_duplex =
network.pc_port.dhcp_server = 1
-network.static_dns_enable = 0
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
#######################################################################################
## VLAN ##
@@ -525,7 +537,7 @@ remote_phonebook.data.1.name = Users
{if isset($yealink_remote_phonebook_1_url) }
remote_phonebook.data.1.url = {$yealink_remote_phonebook_1_url}
{else}
-remote_phonebook.data.1.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=users
+remote_phonebook.data.1.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=users
{/if}
{if isset($yealink_remote_phonebook_2_name) }
@@ -536,7 +548,7 @@ remote_phonebook.data.2.name = Groups
{if isset($yealink_remote_phonebook_2_url) }
remote_phonebook.data.2.url = {$yealink_remote_phonebook_2_url}
{else}
-remote_phonebook.data.2.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+remote_phonebook.data.2.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=groups
{/if}
{if isset($yealink_remote_phonebook_3_name) }
@@ -547,7 +559,7 @@ remote_phonebook.data.3.name = Extensions
{if isset($yealink_remote_phonebook_3_url) }
remote_phonebook.data.3.url = {$yealink_remote_phonebook_3_url}
{else}
-remote_phonebook.data.3.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+remote_phonebook.data.3.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
{/if}
remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
@@ -1532,7 +1544,7 @@ super_search.url =
## Directory Setting ##
#######################################################################################
#Configure the access URL of the directory setting file.
-directory_setting.url = {$yealink_directory_setting_url}
+directory_setting.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=favorite_setting.xml
#######################################################################################
## Configure the access URL of firmware ##
diff --git a/resources/templates/provision/yealink/t32g/y000000000032.cfg b/resources/templates/provision/yealink/t32g/y000000000032.cfg
index 3c6632ae4e..a47a34bd6f 100644
--- a/resources/templates/provision/yealink/t32g/y000000000032.cfg
+++ b/resources/templates/provision/yealink/t32g/y000000000032.cfg
@@ -15,8 +15,8 @@ network.internet_port.type =
network.internet_port.ip =
network.internet_port.mask =
network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+network.primary_dns= {$dns_server_primary}
+network.secondary_dns = {$dns_server_secondary}
#Configure the username and password for PPPOE connection.
#Require reboot;
@@ -112,7 +112,7 @@ network.lldp.packet_interval =
#Enable or disable the phone to obtain DNS from DHCP; 0-Disabled, 1-Enabled (default);
#Require reboot;
-network.static_dns_enable =
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
#######################################################################################
## Syslog Server ##
@@ -921,7 +921,7 @@ remote_phonebook.data.1.name = Users
{if isset($yealink_remote_phonebook_1_url) }
remote_phonebook.data.1.url = {$yealink_remote_phonebook_1_url}
{else}
-remote_phonebook.data.1.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=users
+remote_phonebook.data.1.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=users
{/if}
{if isset($yealink_remote_phonebook_2_name) }
@@ -932,7 +932,7 @@ remote_phonebook.data.2.name = Groups
{if isset($yealink_remote_phonebook_2_url) }
remote_phonebook.data.2.url = {$yealink_remote_phonebook_2_url}
{else}
-remote_phonebook.data.2.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+remote_phonebook.data.2.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=groups
{/if}
{if isset($yealink_remote_phonebook_3_name) }
@@ -943,7 +943,7 @@ remote_phonebook.data.3.name = Extensions
{if isset($yealink_remote_phonebook_3_url) }
remote_phonebook.data.3.url = {$yealink_remote_phonebook_3_url}
{else}
-remote_phonebook.data.3.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+remote_phonebook.data.3.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
{/if}
remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
@@ -1238,7 +1238,7 @@ super_search.url =
## Directory Setting ##
#######################################################################################
#Configure the access URL of the directory setting file.
-directory_setting.url = {$yealink_directory_setting_url}
+directory_setting.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=favorite_setting.xml
#######################################################################################
## Configure the access URL of the Wallpaper ##
diff --git a/resources/templates/provision/yealink/t38g/y000000000038.cfg b/resources/templates/provision/yealink/t38g/y000000000038.cfg
index 07b98c1fe1..1b70ab08f7 100644
--- a/resources/templates/provision/yealink/t38g/y000000000038.cfg
+++ b/resources/templates/provision/yealink/t38g/y000000000038.cfg
@@ -15,8 +15,8 @@ network.internet_port.type =
network.internet_port.ip =
network.internet_port.mask =
network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+network.primary_dns= {$dns_server_primary}
+network.secondary_dns = {$dns_server_secondary}
#Configure the username and password for PPPOE connection.
#Require reboot;
@@ -112,7 +112,7 @@ network.lldp.packet_interval =
#Enable or disable the phone to obtain DNS from DHCP; 0-Disabled, 1-Enabled (default);
#Require reboot;
-network.static_dns_enable =
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
#######################################################################################
## Syslog Server ##
@@ -921,7 +921,7 @@ remote_phonebook.data.1.name = Users
{if isset($yealink_remote_phonebook_1_url) }
remote_phonebook.data.1.url = {$yealink_remote_phonebook_1_url}
{else}
-remote_phonebook.data.1.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=users
+remote_phonebook.data.1.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=users
{/if}
{if isset($yealink_remote_phonebook_2_name) }
@@ -932,7 +932,7 @@ remote_phonebook.data.2.name = Groups
{if isset($yealink_remote_phonebook_2_url) }
remote_phonebook.data.2.url = {$yealink_remote_phonebook_2_url}
{else}
-remote_phonebook.data.2.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+remote_phonebook.data.2.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=groups
{/if}
{if isset($yealink_remote_phonebook_3_name) }
@@ -943,7 +943,7 @@ remote_phonebook.data.3.name = Extensions
{if isset($yealink_remote_phonebook_3_url) }
remote_phonebook.data.3.url = {$yealink_remote_phonebook_3_url}
{else}
-remote_phonebook.data.3.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+remote_phonebook.data.3.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
{/if}
remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
@@ -1241,7 +1241,7 @@ super_search.url =
## Directory Setting ##
#######################################################################################
#Configure the access URL of the directory setting file.
-directory_setting.url = {$yealink_directory_setting_url}
+directory_setting.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=favorite_setting.xml
#######################################################################################
## Configure the access URL of the Wallpaper ##
diff --git a/resources/templates/provision/yealink/t41p/y000000000036.cfg b/resources/templates/provision/yealink/t41p/y000000000036.cfg
index deb79ee6d2..425652cfe3 100644
--- a/resources/templates/provision/yealink/t41p/y000000000036.cfg
+++ b/resources/templates/provision/yealink/t41p/y000000000036.cfg
@@ -7,6 +7,18 @@
#######################################################################################
network.dhcp_host_name =
+#Configure the WAN port type; 0-DHCP(default), 1-PPPoE, 2-Static IP Address;
+#Require reboot;
+network.internet_port.type =
+
+#Configure the static IP address, submask, gateway and DNS server.
+#Require reboot;
+network.internet_port.ip =
+network.internet_port.mask =
+network.internet_port.gateway =
+network.primary_dns = {$dns_server_primary}
+network.secondary_dns = {$dns_server_secondary}
+
#######################################################################################
## PPPOE ##
#######################################################################################
@@ -24,7 +36,7 @@ network.internet_port.speed_duplex =
network.pc_port.speed_duplex =
network.pc_port.dhcp_server = 1
-network.static_dns_enable = 0
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
{if isset($vlan_port_id) }
#######################################################################################
@@ -565,7 +577,7 @@ remote_phonebook.data.1.name = Users
{if isset($yealink_remote_phonebook_1_url) }
remote_phonebook.data.1.url = {$yealink_remote_phonebook_1_url}
{else}
-remote_phonebook.data.1.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=users
+remote_phonebook.data.1.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=users
{/if}
{if isset($yealink_remote_phonebook_2_name) }
@@ -576,7 +588,7 @@ remote_phonebook.data.2.name = Groups
{if isset($yealink_remote_phonebook_2_url) }
remote_phonebook.data.2.url = {$yealink_remote_phonebook_2_url}
{else}
-remote_phonebook.data.2.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+remote_phonebook.data.2.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=groups
{/if}
{if isset($yealink_remote_phonebook_3_name) }
@@ -587,7 +599,7 @@ remote_phonebook.data.3.name = Extensions
{if isset($yealink_remote_phonebook_3_url) }
remote_phonebook.data.3.url = {$yealink_remote_phonebook_3_url}
{else}
-remote_phonebook.data.3.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+remote_phonebook.data.3.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
{/if}
remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
@@ -1572,7 +1584,7 @@ super_search.url =
## Directory Setting ##
#######################################################################################
#Configure the access URL of the directory setting file.
-directory_setting.url = {$yealink_directory_setting_url}
+directory_setting.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=favorite_setting.xml
#######################################################################################
## Configure the access URL of firmware ##
diff --git a/resources/templates/provision/yealink/t42g/y000000000029.cfg b/resources/templates/provision/yealink/t42g/y000000000029.cfg
index a5bb8d5c0d..785fcf444b 100644
--- a/resources/templates/provision/yealink/t42g/y000000000029.cfg
+++ b/resources/templates/provision/yealink/t42g/y000000000029.cfg
@@ -7,6 +7,18 @@
#######################################################################################
network.dhcp_host_name =
+#Configure the WAN port type; 0-DHCP(default), 1-PPPoE, 2-Static IP Address;
+#Require reboot;
+network.internet_port.type =
+
+#Configure the static IP address, submask, gateway and DNS server.
+#Require reboot;
+network.internet_port.ip =
+network.internet_port.mask =
+network.internet_port.gateway =
+network.primary_dns = {$dns_server_primary}
+network.secondary_dns = {$dns_server_secondary}
+
#######################################################################################
## PPPOE ##
#######################################################################################
@@ -24,7 +36,7 @@ network.internet_port.speed_duplex =
network.pc_port.speed_duplex =
network.pc_port.dhcp_server = 1
-network.static_dns_enable = 1
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
{if isset($vlan_port_id) }
#######################################################################################
@@ -565,7 +577,7 @@ remote_phonebook.data.1.name = Users
{if isset($yealink_remote_phonebook_1_url) }
remote_phonebook.data.1.url = {$yealink_remote_phonebook_1_url}
{else}
-remote_phonebook.data.1.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=users
+remote_phonebook.data.1.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=users
{/if}
{if isset($yealink_remote_phonebook_2_name) }
@@ -576,7 +588,7 @@ remote_phonebook.data.2.name = Groups
{if isset($yealink_remote_phonebook_2_url) }
remote_phonebook.data.2.url = {$yealink_remote_phonebook_2_url}
{else}
-remote_phonebook.data.2.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+remote_phonebook.data.2.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=groups
{/if}
{if isset($yealink_remote_phonebook_3_name) }
@@ -587,7 +599,7 @@ remote_phonebook.data.3.name = Extensions
{if isset($yealink_remote_phonebook_3_url) }
remote_phonebook.data.3.url = {$yealink_remote_phonebook_3_url}
{else}
-remote_phonebook.data.3.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+remote_phonebook.data.3.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
{/if}
remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
@@ -1572,7 +1584,7 @@ super_search.url =
## Directory Setting ##
#######################################################################################
#Configure the access URL of the directory setting file.
-directory_setting.url = {$yealink_directory_setting_url}
+directory_setting.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=favorite_setting.xml
#######################################################################################
## Configure the access URL of firmware ##
diff --git a/resources/templates/provision/yealink/t46g/y000000000028.cfg b/resources/templates/provision/yealink/t46g/y000000000028.cfg
index 72bb6d505d..b301c76774 100644
--- a/resources/templates/provision/yealink/t46g/y000000000028.cfg
+++ b/resources/templates/provision/yealink/t46g/y000000000028.cfg
@@ -7,6 +7,18 @@
#######################################################################################
network.dhcp_host_name =
+#Configure the WAN port type; 0-DHCP(default), 1-PPPoE, 2-Static IP Address;
+#Require reboot;
+network.internet_port.type =
+
+#Configure the static IP address, submask, gateway and DNS server.
+#Require reboot;
+network.internet_port.ip =
+network.internet_port.mask =
+network.internet_port.gateway =
+network.primary_dns = {$dns_server_primary}
+network.secondary_dns = {$dns_server_secondary}
+
#######################################################################################
## PPPOE ##
#######################################################################################
@@ -24,7 +36,7 @@ network.internet_port.speed_duplex =
network.pc_port.speed_duplex =
network.pc_port.dhcp_server = 1
-network.static_dns_enable = 0
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
{if isset($vlan_port_id) }
#######################################################################################
@@ -555,7 +567,7 @@ remote_phonebook.data.1.name = Users
{if isset($yealink_remote_phonebook_1_url) }
remote_phonebook.data.1.url = {$yealink_remote_phonebook_1_url}
{else}
-remote_phonebook.data.1.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=users
+remote_phonebook.data.1.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=users
{/if}
{if isset($yealink_remote_phonebook_2_name) }
@@ -566,7 +578,7 @@ remote_phonebook.data.2.name = Groups
{if isset($yealink_remote_phonebook_2_url) }
remote_phonebook.data.2.url = {$yealink_remote_phonebook_2_url}
{else}
-remote_phonebook.data.2.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+remote_phonebook.data.2.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=groups
{/if}
{if isset($yealink_remote_phonebook_3_name) }
@@ -577,7 +589,7 @@ remote_phonebook.data.3.name = Extensions
{if isset($yealink_remote_phonebook_3_url) }
remote_phonebook.data.3.url = {$yealink_remote_phonebook_3_url}
{else}
-remote_phonebook.data.3.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+remote_phonebook.data.3.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
{/if}
remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
@@ -1610,7 +1622,7 @@ super_search.url =
## Directory Setting ##
#######################################################################################
#Configure the access URL of the directory setting file.
-directory_setting.url = http://{$domain_name}/app/provision/?file=favorite_setting.xml
+directory_setting.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=favorite_setting.xml
#######################################################################################
## Configure the access URL of firmware ##
diff --git a/resources/templates/provision/yealink/t48g/y000000000035.cfg b/resources/templates/provision/yealink/t48g/y000000000035.cfg
index cff6b967e9..aa9ad6cf43 100644
--- a/resources/templates/provision/yealink/t48g/y000000000035.cfg
+++ b/resources/templates/provision/yealink/t48g/y000000000035.cfg
@@ -7,6 +7,18 @@
#######################################################################################
network.dhcp_host_name =
+#Configure the WAN port type; 0-DHCP(default), 1-PPPoE, 2-Static IP Address;
+#Require reboot;
+network.internet_port.type =
+
+#Configure the static IP address, submask, gateway and DNS server.
+#Require reboot;
+network.internet_port.ip =
+network.internet_port.mask =
+network.internet_port.gateway =
+network.primary_dns = {$dns_server_primary}
+network.secondary_dns = {$dns_server_secondary}
+
#######################################################################################
## PPPOE ##
#######################################################################################
@@ -24,7 +36,7 @@ network.internet_port.speed_duplex =
network.pc_port.speed_duplex =
network.pc_port.dhcp_server = 1
-network.static_dns_enable = 1
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
{if isset($vlan_port_id) }
#######################################################################################
@@ -517,7 +529,7 @@ remote_phonebook.data.1.name = Users
{if isset($yealink_remote_phonebook_1_url) }
remote_phonebook.data.1.url = {$yealink_remote_phonebook_1_url}
{else}
-remote_phonebook.data.1.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=users
+remote_phonebook.data.1.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=users
{/if}
{if isset($yealink_remote_phonebook_2_name) }
@@ -528,7 +540,7 @@ remote_phonebook.data.2.name = Groups
{if isset($yealink_remote_phonebook_2_url) }
remote_phonebook.data.2.url = {$yealink_remote_phonebook_2_url}
{else}
-remote_phonebook.data.2.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+remote_phonebook.data.2.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=groups
{/if}
{if isset($yealink_remote_phonebook_3_name) }
@@ -539,7 +551,7 @@ remote_phonebook.data.3.name = Extensions
{if isset($yealink_remote_phonebook_3_url) }
remote_phonebook.data.3.url = {$yealink_remote_phonebook_3_url}
{else}
-remote_phonebook.data.3.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+remote_phonebook.data.3.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
{/if}
remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
@@ -1572,7 +1584,7 @@ super_search.url =
## Sirectory Setting ##
#######################################################################################
#Configure the access URL of the directory setting file.
-directory_setting.url = {$yealink_directory_setting_url}
+directory_setting.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=favorite_setting.xml
#######################################################################################
## Configure the access URL of firmware ##
diff --git a/resources/templates/provision/yealink/t49g/y000000000051.cfg b/resources/templates/provision/yealink/t49g/y000000000051.cfg
index 5f6ddd76eb..c05ded2748 100644
--- a/resources/templates/provision/yealink/t49g/y000000000051.cfg
+++ b/resources/templates/provision/yealink/t49g/y000000000051.cfg
@@ -7,6 +7,18 @@
#######################################################################################
network.dhcp_host_name =
+#Configure the WAN port type; 0-DHCP(default), 1-PPPoE, 2-Static IP Address;
+#Require reboot;
+network.internet_port.type =
+
+#Configure the static IP address, submask, gateway and DNS server.
+#Require reboot;
+network.internet_port.ip =
+network.internet_port.mask =
+network.internet_port.gateway =
+network.primary_dns = {$dns_server_primary}
+network.secondary_dns = {$dns_server_secondary}
+
#######################################################################################
## PPPOE ##
#######################################################################################
@@ -24,7 +36,7 @@ network.internet_port.speed_duplex =
network.pc_port.speed_duplex =
network.pc_port.dhcp_server = 1
-network.static_dns_enable = 1
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
{if isset($vlan_port_id) }
#######################################################################################
@@ -565,7 +577,7 @@ remote_phonebook.data.1.name = Users
{if isset($yealink_remote_phonebook_1_url) }
remote_phonebook.data.1.url = {$yealink_remote_phonebook_1_url}
{else}
-remote_phonebook.data.1.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=users
+remote_phonebook.data.1.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=users
{/if}
{if isset($yealink_remote_phonebook_2_name) }
@@ -576,7 +588,7 @@ remote_phonebook.data.2.name = Groups
{if isset($yealink_remote_phonebook_2_url) }
remote_phonebook.data.2.url = {$yealink_remote_phonebook_2_url}
{else}
-remote_phonebook.data.2.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+remote_phonebook.data.2.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=groups
{/if}
{if isset($yealink_remote_phonebook_3_name) }
@@ -587,7 +599,7 @@ remote_phonebook.data.3.name = Extensions
{if isset($yealink_remote_phonebook_3_url) }
remote_phonebook.data.3.url = {$yealink_remote_phonebook_3_url}
{else}
-remote_phonebook.data.3.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+remote_phonebook.data.3.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
{/if}
remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
@@ -1572,7 +1584,7 @@ super_search.url =
## Sirectory Setting ##
#######################################################################################
#Configure the access URL of the directory setting file.
-directory_setting.url = {$yealink_directory_setting_url}
+directory_setting.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=favorite_setting.xml
#######################################################################################
## Configure the access URL of firmware ##
diff --git a/resources/templates/provision/yealink/vp530/y000000000023.cfg b/resources/templates/provision/yealink/vp530/y000000000023.cfg
index fd9e1f64da..e8fa418010 100644
--- a/resources/templates/provision/yealink/vp530/y000000000023.cfg
+++ b/resources/templates/provision/yealink/vp530/y000000000023.cfg
@@ -15,8 +15,8 @@ network.internet_port.type =
network.internet_port.ip =
network.internet_port.mask =
network.internet_port.gateway =
-network.primary_dns =
-network.secondary_dns =
+network.primary_dns = {$dns_server_primary}
+network.secondary_dns = {$dns_server_secondary}
#Configure the username and password for PPPOE connection.
#Require reboot;
@@ -797,7 +797,7 @@ remote_phonebook.data.1.name = Users
{if isset($yealink_remote_phonebook_1_url) }
remote_phonebook.data.1.url = {$yealink_remote_phonebook_1_url}
{else}
-remote_phonebook.data.1.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=users
+remote_phonebook.data.1.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=users
{/if}
{if isset($yealink_remote_phonebook_2_name) }
@@ -808,7 +808,7 @@ remote_phonebook.data.2.name = Groups
{if isset($yealink_remote_phonebook_2_url) }
remote_phonebook.data.2.url = {$yealink_remote_phonebook_2_url}
{else}
-remote_phonebook.data.2.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+remote_phonebook.data.2.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=groups
{/if}
{if isset($yealink_remote_phonebook_3_name) }
@@ -819,7 +819,7 @@ remote_phonebook.data.3.name = Extensions
{if isset($yealink_remote_phonebook_3_url) }
remote_phonebook.data.3.url = {$yealink_remote_phonebook_3_url}
{else}
-remote_phonebook.data.3.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+remote_phonebook.data.3.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
{/if}
remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
@@ -1091,7 +1091,7 @@ super_search.url =
## Directory Setting ##
#######################################################################################
#Configure the access URL of the directory setting file.
-directory_setting.url = {$yealink_directory_setting_url}
+directory_setting.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=favorite_setting.xml
#######################################################################################
## Shortcut Keys ##
diff --git a/resources/templates/provision/yealink/w52p/y000000000025.cfg b/resources/templates/provision/yealink/w52p/y000000000025.cfg
index abf4f18fc4..2540c7472d 100644
--- a/resources/templates/provision/yealink/w52p/y000000000025.cfg
+++ b/resources/templates/provision/yealink/w52p/y000000000025.cfg
@@ -5,7 +5,17 @@
#######################################################################################
## Network ##
#######################################################################################
+#Configure the WAN port type; 0-DHCP(default), 1-PPPoE, 2-Static IP Address;
+#Require reboot;
+network.internet_port.type =
+#Configure the static IP address, submask, gateway and DNS server.
+#Require reboot;
+network.internet_port.ip =
+network.internet_port.mask =
+network.internet_port.gateway =
+network.primary_dns = {$dns_server_primary}
+network.secondary_dns = {$dns_server_secondary}
#Configure the username and password for PPPOE connection.
#Require reboot;
@@ -379,7 +389,7 @@ remote_phonebook.data.1.name = Users
{if isset($yealink_remote_phonebook_1_url) }
remote_phonebook.data.1.url = {$yealink_remote_phonebook_1_url}
{else}
-remote_phonebook.data.1.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=users
+remote_phonebook.data.1.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=users
{/if}
{if isset($yealink_remote_phonebook_2_name) }
@@ -390,7 +400,7 @@ remote_phonebook.data.2.name = Groups
{if isset($yealink_remote_phonebook_2_url) }
remote_phonebook.data.2.url = {$yealink_remote_phonebook_2_url}
{else}
-remote_phonebook.data.2.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+remote_phonebook.data.2.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=groups
{/if}
{if isset($yealink_remote_phonebook_3_name) }
@@ -401,7 +411,7 @@ remote_phonebook.data.3.name = Extensions
{if isset($yealink_remote_phonebook_3_url) }
remote_phonebook.data.3.url = {$yealink_remote_phonebook_3_url}
{else}
-remote_phonebook.data.3.url = http://{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+remote_phonebook.data.3.url = http://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
{/if}
remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}