From 04dfb866405ec8ea7184a965e174926e05ec58f1 Mon Sep 17 00:00:00 2001
From: markjcrane <markjcrane@gmail.com>
Date: Mon, 2 May 2016 13:10:32 -0600
Subject: [PATCH] Add dns_server_primary and dns_server_secondary to the newer
 yealink provisioning files.

---
 .../provision/yealink/cp860/{$mac}.cfg        | 25 ++++++++++---------
 .../provision/yealink/t21p/{$mac}.cfg         | 24 +++++++++---------
 .../provision/yealink/t23g/{$mac}.cfg         | 24 +++++++++---------
 .../provision/yealink/t23p/{$mac}.cfg         | 24 +++++++++---------
 .../provision/yealink/t27p/{$mac}.cfg         | 24 +++++++++---------
 .../provision/yealink/t29g/{$mac}.cfg         | 24 +++++++++---------
 .../provision/yealink/t41p/{$mac}.cfg         | 24 +++++++++---------
 .../provision/yealink/t42g/{$mac}.cfg         | 24 +++++++++---------
 .../provision/yealink/t46g/{$mac}.cfg         | 24 +++++++++---------
 .../provision/yealink/t48g/{$mac}.cfg         | 25 +++++++++----------
 .../provision/yealink/t49g/{$mac}.cfg         | 24 +++++++++---------
 .../provision/yealink/w52p/{$mac}.cfg         |  5 ++--
 12 files changed, 136 insertions(+), 135 deletions(-)

diff --git a/resources/templates/provision/yealink/cp860/{$mac}.cfg b/resources/templates/provision/yealink/cp860/{$mac}.cfg
index 61c077e17a..2d415df16c 100644
--- a/resources/templates/provision/yealink/cp860/{$mac}.cfg
+++ b/resources/templates/provision/yealink/cp860/{$mac}.cfg
@@ -951,9 +951,9 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
-network.static_dns_enable = 0
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
 
 #######################################################################################
 ##                           Account 3 Basic Settings                                ##
@@ -1443,8 +1443,9 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
 
 
 #######################################################################################
@@ -1935,8 +1936,8 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
 
 #######################################################################################
 ##                           Account 5 Basic Settings                                ##
@@ -2426,8 +2427,8 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
 
 #######################################################################################
 ##                           Account 6 Basic Settings                                ##
@@ -2917,9 +2918,9 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns =
-network.secondary_dns =
-network.static_dns_enable = 0
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
 
 #######################################################################################
 ##                             Line Key                                              ##
diff --git a/resources/templates/provision/yealink/t21p/{$mac}.cfg b/resources/templates/provision/yealink/t21p/{$mac}.cfg
index c9c78fbed4..b52e8023b1 100644
--- a/resources/templates/provision/yealink/t21p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t21p/{$mac}.cfg
@@ -951,9 +951,9 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
-network.static_dns_enable = 0
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
 
 #######################################################################################
 ##                           Account 3 Basic Settings                                ##
@@ -1443,8 +1443,8 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
 
 
 #######################################################################################
@@ -1935,8 +1935,8 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
 
 #######################################################################################
 ##                           Account 5 Basic Settings                                ##
@@ -2426,8 +2426,8 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
 
 #######################################################################################
 ##                           Account 6 Basic Settings                                ##
@@ -2917,9 +2917,9 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns =
-network.secondary_dns =
-network.static_dns_enable = 0
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
 
 #######################################################################################
 ##                             Line Key                                              ##
diff --git a/resources/templates/provision/yealink/t23g/{$mac}.cfg b/resources/templates/provision/yealink/t23g/{$mac}.cfg
index c9c78fbed4..b52e8023b1 100644
--- a/resources/templates/provision/yealink/t23g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t23g/{$mac}.cfg
@@ -951,9 +951,9 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
-network.static_dns_enable = 0
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
 
 #######################################################################################
 ##                           Account 3 Basic Settings                                ##
@@ -1443,8 +1443,8 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
 
 
 #######################################################################################
@@ -1935,8 +1935,8 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
 
 #######################################################################################
 ##                           Account 5 Basic Settings                                ##
@@ -2426,8 +2426,8 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
 
 #######################################################################################
 ##                           Account 6 Basic Settings                                ##
@@ -2917,9 +2917,9 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns =
-network.secondary_dns =
-network.static_dns_enable = 0
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
 
 #######################################################################################
 ##                             Line Key                                              ##
diff --git a/resources/templates/provision/yealink/t23p/{$mac}.cfg b/resources/templates/provision/yealink/t23p/{$mac}.cfg
index c9c78fbed4..b52e8023b1 100644
--- a/resources/templates/provision/yealink/t23p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t23p/{$mac}.cfg
@@ -951,9 +951,9 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
-network.static_dns_enable = 0
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
 
 #######################################################################################
 ##                           Account 3 Basic Settings                                ##
@@ -1443,8 +1443,8 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
 
 
 #######################################################################################
@@ -1935,8 +1935,8 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
 
 #######################################################################################
 ##                           Account 5 Basic Settings                                ##
@@ -2426,8 +2426,8 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
 
 #######################################################################################
 ##                           Account 6 Basic Settings                                ##
@@ -2917,9 +2917,9 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns =
-network.secondary_dns =
-network.static_dns_enable = 0
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
 
 #######################################################################################
 ##                             Line Key                                              ##
diff --git a/resources/templates/provision/yealink/t27p/{$mac}.cfg b/resources/templates/provision/yealink/t27p/{$mac}.cfg
index c9c78fbed4..b52e8023b1 100644
--- a/resources/templates/provision/yealink/t27p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t27p/{$mac}.cfg
@@ -951,9 +951,9 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
-network.static_dns_enable = 0
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
 
 #######################################################################################
 ##                           Account 3 Basic Settings                                ##
@@ -1443,8 +1443,8 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
 
 
 #######################################################################################
@@ -1935,8 +1935,8 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
 
 #######################################################################################
 ##                           Account 5 Basic Settings                                ##
@@ -2426,8 +2426,8 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
 
 #######################################################################################
 ##                           Account 6 Basic Settings                                ##
@@ -2917,9 +2917,9 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns =
-network.secondary_dns =
-network.static_dns_enable = 0
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
 
 #######################################################################################
 ##                             Line Key                                              ##
diff --git a/resources/templates/provision/yealink/t29g/{$mac}.cfg b/resources/templates/provision/yealink/t29g/{$mac}.cfg
index c9c78fbed4..b52e8023b1 100644
--- a/resources/templates/provision/yealink/t29g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t29g/{$mac}.cfg
@@ -951,9 +951,9 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
-network.static_dns_enable = 0
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
 
 #######################################################################################
 ##                           Account 3 Basic Settings                                ##
@@ -1443,8 +1443,8 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
 
 
 #######################################################################################
@@ -1935,8 +1935,8 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
 
 #######################################################################################
 ##                           Account 5 Basic Settings                                ##
@@ -2426,8 +2426,8 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
 
 #######################################################################################
 ##                           Account 6 Basic Settings                                ##
@@ -2917,9 +2917,9 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns =
-network.secondary_dns =
-network.static_dns_enable = 0
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
 
 #######################################################################################
 ##                             Line Key                                              ##
diff --git a/resources/templates/provision/yealink/t41p/{$mac}.cfg b/resources/templates/provision/yealink/t41p/{$mac}.cfg
index c9c78fbed4..b52e8023b1 100644
--- a/resources/templates/provision/yealink/t41p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t41p/{$mac}.cfg
@@ -951,9 +951,9 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
-network.static_dns_enable = 0
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
 
 #######################################################################################
 ##                           Account 3 Basic Settings                                ##
@@ -1443,8 +1443,8 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
 
 
 #######################################################################################
@@ -1935,8 +1935,8 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
 
 #######################################################################################
 ##                           Account 5 Basic Settings                                ##
@@ -2426,8 +2426,8 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
 
 #######################################################################################
 ##                           Account 6 Basic Settings                                ##
@@ -2917,9 +2917,9 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns =
-network.secondary_dns =
-network.static_dns_enable = 0
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
 
 #######################################################################################
 ##                             Line Key                                              ##
diff --git a/resources/templates/provision/yealink/t42g/{$mac}.cfg b/resources/templates/provision/yealink/t42g/{$mac}.cfg
index 1f86c4d625..dc3cc0243a 100644
--- a/resources/templates/provision/yealink/t42g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t42g/{$mac}.cfg
@@ -951,9 +951,9 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
-network.static_dns_enable = 0
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
 
 #######################################################################################
 ##                           Account 3 Basic Settings                                ##
@@ -1443,8 +1443,8 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
 
 
 #######################################################################################
@@ -1935,8 +1935,8 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
 
 #######################################################################################
 ##                           Account 5 Basic Settings                                ##
@@ -2426,8 +2426,8 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
 
 #######################################################################################
 ##                           Account 6 Basic Settings                                ##
@@ -2917,9 +2917,9 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns =
-network.secondary_dns =
-network.static_dns_enable = 0
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
 
 #######################################################################################
 ##                             Line Key                                              ##
diff --git a/resources/templates/provision/yealink/t46g/{$mac}.cfg b/resources/templates/provision/yealink/t46g/{$mac}.cfg
index a268f9a53d..7bb4ad6c7e 100644
--- a/resources/templates/provision/yealink/t46g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t46g/{$mac}.cfg
@@ -951,9 +951,9 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
-network.static_dns_enable = 0
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
 
 #######################################################################################
 ##                           Account 3 Basic Settings                                ##
@@ -1443,8 +1443,8 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
 
 
 #######################################################################################
@@ -1935,8 +1935,8 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
 
 #######################################################################################
 ##                           Account 5 Basic Settings                                ##
@@ -2426,8 +2426,8 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
 
 #######################################################################################
 ##                           Account 6 Basic Settings                                ##
@@ -2917,9 +2917,9 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns =
-network.secondary_dns =
-network.static_dns_enable = 0
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
 
 #######################################################################################
 ##                             Line Key                                              ##
diff --git a/resources/templates/provision/yealink/t48g/{$mac}.cfg b/resources/templates/provision/yealink/t48g/{$mac}.cfg
index eff584c3b5..5af5d785b9 100644
--- a/resources/templates/provision/yealink/t48g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t48g/{$mac}.cfg
@@ -951,9 +951,9 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
-network.static_dns_enable = 0
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
 
 #######################################################################################
 ##                           Account 3 Basic Settings                                ##
@@ -1443,9 +1443,8 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
-
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
 
 #######################################################################################
 ##                           Account 4 Basic Settings                                ##
@@ -1935,8 +1934,8 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
 
 #######################################################################################
 ##                           Account 5 Basic Settings                                ##
@@ -2426,8 +2425,8 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
 
 #######################################################################################
 ##                           Account 6 Basic Settings                                ##
@@ -2917,9 +2916,9 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns =
-network.secondary_dns =
-network.static_dns_enable = 0
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
 
 #######################################################################################
 ##                             Line Key                                              ##
diff --git a/resources/templates/provision/yealink/t49g/{$mac}.cfg b/resources/templates/provision/yealink/t49g/{$mac}.cfg
index eff584c3b5..32191db2ea 100644
--- a/resources/templates/provision/yealink/t49g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t49g/{$mac}.cfg
@@ -951,9 +951,9 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
-network.static_dns_enable = 0
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
 
 #######################################################################################
 ##                           Account 3 Basic Settings                                ##
@@ -1443,8 +1443,8 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
 
 
 #######################################################################################
@@ -1935,8 +1935,8 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
 
 #######################################################################################
 ##                           Account 5 Basic Settings                                ##
@@ -2426,8 +2426,8 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
 
 #######################################################################################
 ##                           Account 6 Basic Settings                                ##
@@ -2917,9 +2917,9 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns =
-network.secondary_dns =
-network.static_dns_enable = 0
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
 
 #######################################################################################
 ##                             Line Key                                              ##
diff --git a/resources/templates/provision/yealink/w52p/{$mac}.cfg b/resources/templates/provision/yealink/w52p/{$mac}.cfg
index 6e9260f831..f67618a0a8 100644
--- a/resources/templates/provision/yealink/w52p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/w52p/{$mac}.cfg
@@ -1218,5 +1218,6 @@ network.internet_port.type =
 network.internet_port.ip =
 network.internet_port.mask =
 network.internet_port.gateway =
-network.primary_dns=
-network.secondary_dns =
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}