From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Fri, 27 Nov 2015 16:58:57 +0000 (+0100)
Subject: dnsdist: show correct version in the webpage
X-Git-Tag: dnsdist-1.0.0-alpha1~186^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52f40d27a1a9bd3fcfa2f10ba9bd82cf35ecd8d6;p=thirdparty%2Fpdns.git

dnsdist: show correct version in the webpage
---

diff --git a/pdns/dnsdist-web.cc b/pdns/dnsdist-web.cc
index e224fe46e4..fbd41e9bd2 100644
--- a/pdns/dnsdist-web.cc
+++ b/pdns/dnsdist-web.cc
@@ -149,7 +149,7 @@ static void connectionThread(int sock, ComboAddress remote, string password)
  
       Json my_json = Json::object {
 	{ "daemon_type", "dnsdist" },
-	{ "version", "0.1"},
+	{ "version", VERSION},
 	{ "servers", servers},
 	{ "rules", rules},
       };
diff --git a/pdns/dnsdistdist/html/local.js b/pdns/dnsdistdist/html/local.js
index 51df5a3575..9e44f7656e 100644
--- a/pdns/dnsdistdist/html/local.js
+++ b/pdns/dnsdistdist/html/local.js
@@ -186,7 +186,7 @@ $(document).ready(function() {
 	
 	$.ajax({ url: 'servers/localhost', type: 'GET', dataType: 'json',
 		 success: function(data) {
-		     $("#version").text("PowerDNS "+data["daemon_type"]+" "+data["version"]);
+		     $("#version").text(data["daemon_type"]+" "+data["version"]);
 		     var bouw="<table><tr align=right><th>#</th><th align=left>Name</th><th align=left>Address</th><th>Status</th><th>Queries</th><th>Drops</th><th>QPS</th><th>Out</th><th>Weight</th><th>Order</th><th align=left>Pools</th></tr>";
 		     $.each(data["servers"], function(a,b) {
 		         bouw = bouw + ("<tr align=right><td>"+b["id"]+"</td><td align=left>"+b["name"]+"</td><td align=left>"+b["address"]+"</td><td>"+b["state"]+"</td>");