dnsdist: show correct version in the webpage

diff --git a/pdns/dnsdist-web.cc b/pdns/dnsdist-web.cc
index e224fe46e4549a09c0f415432f0dce761d3014c5..fbd41e9bd2d4e29faf2d8aa4626a5045e8f28d62 100644 (file)
--- 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 51df5a357520522bd9840257a4747c9d3629d6a2..9e44f7656e90a4ce564eb18296883ef4bfad8d97 100644 (file)
--- 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>");