Big refactor of the email / web report.

1 files changed, 181 insertions, 259 deletions

diff --git a/apt-panopticon-report-email-web.lua b/apt-panopticon-report-email-web.lua
index a08b901..97f7cef 100755
--- a/apt-panopticon-report-email-web.lua
+++ b/apt-panopticon-report-email-web.lua
@@ -14,10 +14,16 @@ local results = {}
 APT.mirrors = loadfile("results/mirrors.lua")()
 APT.debians = loadfile("results/debians.lua")()
 
+
+local lnk = function(name, link)
+    if nil == link then link = name end
+    return name .. " <a href='explanations.html#" .. link .. "'>*</a>"
+end
+
 local revDNS = function(hosts, dom, IP)
-    if "deb.devuan.org" ~= dom then
-        if nil ~= hosts["deb.devuan.org"] then
-            if nil ~= hosts["deb.devuan.org"].IPs["deb.roundr.devuan.org"][IP] then
+    if APT.options.roundRobin.value ~= dom then
+        if nil ~= hosts[APT.options.roundRobin.value] then
+            if nil ~= hosts[APT.options.roundRobin.value].IPs["deb.roundr.devuan.org"][IP] then
                 if APT.html then
                     return "<font color='purple'><b>DNS-RR</b></font>"
                 else
@@ -27,7 +33,7 @@ local revDNS = function(hosts, dom, IP)
         end
     else
         for k, v in pairs(hosts) do
-            if "deb.devuan.org" ~= k then
+            if APT.options.roundRobin.value ~= k then
                 local IPs = v.IPs
                 for i, u in pairs(IPs) do
                     if "table" == type(u) then
@@ -174,6 +180,162 @@ local redirs = function(hosts, host)
     return redirs
 end
 
+
+local DNSrrTest = function(hosts, k)
+    local dns = ''
+    local space = ' '
+    local no = 'no'
+    if APT.html then
+        space = ' &nbsp; '
+        no = "<font color='grey'><b>no</b></font>"
+    end
+    if (APT.options.roundRobin.value ~= k) and (nil ~= hosts[APT.options.roundRobin.value]) then
+        APT.allpairs(hosts[k].IPs,
+            function(i, w, k, v)
+                if nil ~= hosts[APT.options.roundRobin.value].IPs["deb.roundr.devuan.org"][i] then
+                    local log = logCount(APT.options.roundRobin.value, i)
+                    if "" ~= log then
+                        if "" == dns then dns = " " else dns = dns .. space end
+                        dns = dns .. logCount(APT.options.roundRobin.value, i)
+                    else
+                        if "" == dns then dns = " " else dns = dns .. space end
+                        if APT.html then i = "<font color='maroon'><b>" .. i .. "</b></font>" end
+                        dns = dns .. i
+                    end
+                end
+            end
+        )
+        if "" == dns then dns = no end
+    end
+    return dns
+end
+
+local makeTable = function(web, hosts)
+    web:write("<table>\n<tr><th></th><th>" .. lnk('FTP') .. "</th><th>" .. lnk('HTTP') .. "</th><th>" .. lnk('HTTPS') .. "</th><th>" .. lnk('RSYNC') .. "</th>" .. 
+                "<th>" .. lnk('DNS round robin', 'DNS-RR') .. "</th><th>" .. lnk('Protocol') .. "</th><th>" .. lnk('URL sanity', 'URL-Sanity') .. "</th><th>" .. lnk('Integrity') .. "</th>" ..
+                "<th>" .. lnk('Updated') .. "</th><th colspan='2'>" .. lnk('Speed range', 'Speed') .. "</th>" ..
+                "<th colspan='2'>" .. lnk('Weekly statistics', 'Weekly') .. "</th><th>" .. lnk('Graphs') .. "</th></tr>\n")
+    local bg = ''
+    for k, v in APT.orderedPairs(hosts) do
+        if '' == bg then bg = " style='background-color:#111111'" else bg = '' end
+        local results = APT.collateAll(hosts, 'results', k)
+        local active = ""
+        if "yes" == v.Active then
+            web:write("     <tr" .. bg .. "><th>" .. k .. "</th> ")
+        else
+            if nil == v.Active then active = 'nil' else active = v.Active end
+            web:write("     <tr style='background-color:dimgrey'><th>" .. k .. "</th> ")
+        end
+        local ftp       = "<font color='grey'><b>skip</b></font>"
+        local http      = status(hosts, k, results, "http")
+        local https     = status(hosts, k, results, "https")
+        local rsync     = "<font color='grey'><b>skip</b></font>"
+        local dns       = DNSrrTest(hosts, k)
+        local protocol  = status(hosts, k, results, "Protocol")
+        local sanity    = status(hosts, k, results, "URLSanity")
+        local integrity = status(hosts, k, results, "Integrity")
+        local updated   = status(hosts, k, results, "Updated")
+        local rate = v.Rate
+        if nil ~= rate then updated = updated .. ' ' .. rate end
+        local min       = tonumber(results.speed.min)
+        local max       = tonumber(results.speed.max)
+        local spd       = '<td></td><td></td>'
+        local week      = '<td></td><td></td>'
+        local graph     = '<a href="../apt-panopticon_cgp/host.php?h=' .. k .. '">graphs</a>'
+
+        -- DNS-RR test.
+        if (APT.options.roundRobin.value ~= k) and (nil ~= hosts[APT.options.roundRobin.value]) then
+            if 0 == max then
+                spd = '<td></td><td></td>'
+            else
+                spd = string.format('<td align="right">%d -</td><td align="right">%d</td>', min, max)
+            end
+        end
+
+        if (APT.options.roundRobin.value ~= k) then
+            local percentUp = '??'
+            local percentUpdated = '??'
+            if APT.checkFile('rrd/' .. k .. '/Speed/Speed.rrd') then
+                local start, step, names, data = APT.rrd.fetch('rrd/' .. k .. '/Speed/Speed.rrd', 'LAST', '-a', '-r', '10m', '-s', '-1w')
+                local count, up, down, unknown = 0, 0, 0, 0
+                for i, dp in ipairs(data) do
+                    for j,v in ipairs(dp) do
+                        if 'max' == names[j] then
+                            if 'nan' == tostring(v) then
+                                unknown = unknown + 1
+                            else
+                                count = count + 1
+                                if 0 == v then down = down + 1 else up = up + 1 end
+                            end
+                        end
+                    end
+                end
+                percentUp = string.format('%.2f', up / count * 100)
+            end
+            if APT.checkFile('rrd/' .. k .. '/HTTP/Tests.rrd') then
+                local start, step, names, data = APT.rrd.fetch('rrd/' .. k .. '/HTTP/Tests.rrd', 'LAST', '-a', '-r', '10m', '-s', '-1w')
+                local count, up, down, unknown = 0, 0, 0, 0
+                for i,dp in ipairs(data) do
+                    for j,v in ipairs(dp) do
+                        if 'UpdatedErrors' == names[j] then
+                            if 'nan' == tostring(v) then
+                                unknown = unknown + 1
+                            else
+                                count = count + 1
+                                if 0 == v then down = down + 1 else up = up + 1 end
+                            end
+                        end
+                    end
+                end
+                percentUpdated = string.format('%.2f', (down / count * 100))
+                if '0.00' == percentUp then percentUpdated = '??' end   -- We are counting errors, and you can't get an error if you can't check anything.
+                                                                        -- TODO - try to account for this better, this is just a quick hack.
+            end
+            week = '<td>' .. percentUp .. '% up</td><td>' .. percentUpdated .. '% updated</td>'
+        end
+
+        web:write("<td>" .. ftp .. "&nbsp;</td><td>" .. http .. "&nbsp;</td><td>" .. https .. "&nbsp;</td><td>" .. rsync .. "&nbsp;</td><td>" .. dns ..
+                    "&nbsp;</td><td>" .. protocol .. "&nbsp;</td><td>" .. sanity .. "&nbsp;</td><td>" .. integrity .. "&nbsp;</td><td>" .. updated .. 
+                    "&nbsp;" .. spd .. "&nbsp;" .. week .."&nbsp;<td>" .. graph .. "</td></tr>\n")
+        if "" ~= active then
+            web:write("<tr><td style='background-color:dimgrey'>" .. active .. "</td></tr>\n")
+        end
+    end
+    web:write( "</table>\n<br>\n")
+end
+
+local makeIPlist = function(hosts)
+    local m = {}
+    for k, v in pairs(hosts) do
+        local log = k
+        local n = {}
+        log = logCount(k)
+        hosts[k].Protocols = nil
+        hosts[k].FQDN = nil
+        hosts[k].Active = nil
+        hosts[k].Rate = nil
+        hosts[k].BaseURL = nil
+        hosts[k].Country = nil
+        hosts[k].Bandwidth = nil
+
+        for l, w in pairs(hosts[k].IPs) do
+            if type(w) == "table" then
+                n[l] = {}
+                for i, u in pairs(w) do
+                    local log = logCount(k, i)
+                    if "" == log then n[l][i] = u else n[l][log .. " " .. revDNS(hosts, k, i)] = u end
+                end
+            else
+                local log = logCount(k, l)
+                if "" == log then n[l] = w else n[log .. " " .. revDNS(hosts, k, l)] = w end
+            end
+        end
+        m[log .. " DNS entries -" .. redirs(hosts, k)] = n
+    end
+    return m
+end
+
+
 APT.html = false
 local email, e = io.open("results/Report-email.txt", "w+")
 if nil == email then C("opening mirrors file - " .. e) else
@@ -197,29 +359,14 @@ if nil == email then C("opening mirrors file - " .. e) else
         local http      = status(APT.mirrors, k, results, "http")
         local https     = status(APT.mirrors, k, results, "https")
         local rsync     = "[skip]"
-        local dns       = ""
+        local dns       = DNSrrTest(APT.mirrors, k)
         local protocol  = status(APT.mirrors, k, results, "Protocol")
         local sanity    = status(APT.mirrors, k, results, "URLSanity")
         local integrity = status(APT.mirrors, k, results, "Integrity")
         local updated   = status(APT.mirrors, k, results, "Updated")
 
         -- DNS-RR test.
-        if ("deb.devuan.org" ~= k) and (nil ~= APT.mirrors["deb.devuan.org"]) then
-            APT.allpairs(APT.mirrors[k].IPs,
-                function(i, w, k, v)
-                    if nil ~= APT.mirrors["deb.devuan.org"].IPs["deb.roundr.devuan.org"][i] then
-                        local log = logCount("deb.devuan.org", i)
-                        if "" ~= log then
-                            if "" == dns then dns = " " else dns = dns .. "  " end
-                            dns = dns .. logCount("deb.devuan.org", i)
-                        else
-                            if "" == dns then dns = " " else dns = dns .. "  " end
-                            dns = dns .. i
-                        end
-                    end
-                end
-            )
-            if "" == dns then dns = "[no]" end
+        if (APT.options.roundRobin.value ~= k) and (nil ~= APT.mirrors[APT.options.roundRobin.value]) then
             dns = " DNS-RR: " .. dns
         end
 
@@ -241,11 +388,6 @@ if nil == email then C("opening mirrors file - " .. e) else
     email:close()
 end
 
-local lnk = function(name, link)
-    if nil == link then link = name end
-    return name .. " <a href='explanations.html#" .. link .. "'>*</a>"
-end
-
 
 local colours = 
 {
@@ -275,17 +417,17 @@ local colours =
 local g = {}
 local count = 0
 for k, v in APT.orderedPairs(mirrors) do
-    if 'pkgmaster.devuan.org' ~= k then count = count + 1 end
+    if APT.options.referenceSite.value ~= k then count = count + 1 end
 end
 for i = 1, count do
 end
 
 count = 1
 for k, v in APT.orderedPairs(mirrors) do
-    if 'deb.devuan.org' ~= k then
+    if APT.options.roundRobin.value ~= k then
         local c = colours[count]
         local name = string.format('%32s', k)
-        if 'pkgmaster.devuan.org' == k then c = 'ffffff' end
+        if APT.options.referenceSite.value == k then c = 'ffffff' end
         table.insert(g, 'DEF:speedn' .. count .. '=rrd/' .. k .. '/Speed/Speed.rrd:max:MIN')
         table.insert(g, 'DEF:speedx' .. count .. '=rrd/' .. k .. '/Speed/Speed.rrd:max:MAX')
         table.insert(g, 'DEF:speeda' .. count .. '=rrd/' .. k .. '/Speed/Speed.rrd:max:AVERAGE')
@@ -343,153 +485,23 @@ if nil == web then C("opening mirrors file - " .. e) else
                 "<p>NOTE: timeouts may be due to a problem on the testing computer.</p>" ..
                 "<p>The DNS round robin (DNS-RR) column shows the IPs for that mirror, or <font color='grey'><b>no</b></font> if it isn't part of the DNS-RR. &nbsp; " ..
                 "The IPs link to the testing log for that IP accessed via the DNS-RR. &nbsp; " ..
-                "deb.devuan.org is the DNS-RR itself, so it doesn't get tested directly.</p>\n" ..
+                APT.options.roundRobin.value .. " is the DNS-RR itself, so it doesn't get tested directly.</p>\n" ..
                 "<p>The time in the Updated column is how often the mirror updates itself.</p>" ..
                 "<p>Mirrors with a <font style='background-color:dimgrey'>grey background</font> are not active (though may be usable as part of the DNS-RR).</p>\n" ..
-                "<p><font color='grey'><b>skip</b></font> means that the test hasn't been written yet.</p>\n" ..
-                "<table>\n<tr><th></th><th>" .. lnk('FTP') .. "</th><th>" .. lnk('HTTP') .. "</th><th>" .. lnk('HTTPS') .. "</th><th>" .. lnk('RSYNC') .. "</th>" .. 
-                "<th>" .. lnk('DNS round robin', 'DNS-RR') .. "</th><th>" .. lnk('Protocol') .. "</th><th>" .. lnk('URL sanity', 'URL-Sanity') .. "</th><th>" .. lnk('Integrity') .. "</th>" ..
-                "<th>" .. lnk('Updated') .. "</th><th colspan='2'>" .. lnk('Speed range', 'Speed') .. "</th>" ..
-                "<th colspan='2'>" .. lnk('Weekly statistics', 'Weekly') .. "</th><th>" .. lnk('Graphs') .. "</th></tr>\n"
+                "<p><font color='grey'><b>skip</b></font> means that the test hasn't been written yet.</p>\n"
                 )
 
-    local bg = ''
-    for k, v in APT.orderedPairs(APT.mirrors) do
-        local results = APT.collateAll(APT.mirrors, 'results', k)
-        if '' == bg then bg = " style='background-color:#111111'" else bg = '' end
-        local active = ""
-        if "yes" == v.Active then
-            web:write("     <tr" .. bg .. "><th>" .. k .. "</th> ")
-        else
-            if nil == v.Active then active = 'nil' else active = v.Active end
-            web:write("     <tr style='background-color:dimgrey'><th>" .. k .. "</th> ")
-        end
-        local ftp       = "<font color='grey'><b>skip</b></font>"
-        local http      = status(APT.mirrors, k, results, "http")
-        local https     = status(APT.mirrors, k, results, "https")
-        local rsync     = "<font color='grey'><b>skip</b></font>"
-        local dns       = ""
-        local protocol  = status(APT.mirrors, k, results, "Protocol")
-        local sanity    = status(APT.mirrors, k, results, "URLSanity")
-        local integrity = status(APT.mirrors, k, results, "Integrity")
-        local updated   = status(APT.mirrors, k, results, "Updated")
-        local rate = v.Rate
-        if nil ~= rate then updated = updated .. ' ' .. rate end
-        local min       = tonumber(results.speed.min)
-        local max       = tonumber(results.speed.max)
-        local spd       = '<td></td><td></td>'
-        local week      = '<td></td><td></td>'
-        local graph     = '<a href="../apt-panopticon_cgp/host.php?h=' .. k .. '">graphs</a>'
-
-        -- DNS-RR test.
-        if ("deb.devuan.org" ~= k) and (nil ~= APT.mirrors["deb.devuan.org"]) then
-            APT.allpairs(APT.mirrors[k].IPs,
-                function(i, w, k, v)
-                    if nil ~= APT.mirrors["deb.devuan.org"].IPs["deb.roundr.devuan.org"][i] then
-                        local log = logCount("deb.devuan.org", i)
-                        if "" ~= log then
-                            if "" == dns then dns = " " else dns = dns .. " &nbsp; " end
-                            dns = dns .. logCount("deb.devuan.org", i)
-                        else
-                            if "" == dns then dns = " " else dns = dns .. " &nbsp; " end
-                            dns = dns .. "<font color='maroon'><b>" .. i .. "</b></font>"
-                        end
-                    end
-                end
-            )
-            if "" == dns then dns = "<font color='grey'><b>no</b></font>" end
-
-            if 0 == max then
-                spd = '<td></td><td></td>'
-            else
-                spd = string.format('<td align="right">%d -</td><td align="right">%d</td>', min, max)
-            end
-        end
-
-        if ("deb.devuan.org" ~= k) then
-            local percentUp = '???'
-            local percentUpdated = '???'
-            if APT.checkFile('rrd/' .. k .. '/Speed/Speed.rrd') then
-                local start, step, names, data = APT.rrd.fetch('rrd/' .. k .. '/Speed/Speed.rrd', 'LAST', '-a', '-r', '10m', '-s', '-1w')
-                local count, up, down, unknown = 0, 0, 0, 0
-                for i, dp in ipairs(data) do
-                    for j,v in ipairs(dp) do
-                        if 'max' == names[j] then
-                            if 'nan' == tostring(v) then
-                                unknown = unknown + 1
-                            else
-                                count = count + 1
-                                if 0 == v then down = down + 1 else up = up + 1 end
-                            end
-                        end
-                    end
-                end
-                percentUp = string.format('%.2f', up / count * 100)
-            end
-            if APT.checkFile('rrd/' .. k .. '/HTTP/Tests.rrd') then
-                local start, step, names, data = APT.rrd.fetch('rrd/' .. k .. '/HTTP/Tests.rrd', 'LAST', '-a', '-r', '10m', '-s', '-1w')
-                local count, up, down, unknown = 0, 0, 0, 0
-                for i,dp in ipairs(data) do
-                    for j,v in ipairs(dp) do
-                        if 'UpdatedErrors' == names[j] then
-                            if 'nan' == tostring(v) then
-                                unknown = unknown + 1
-                            else
-                                count = count + 1
-                                if 0 == v then down = down + 1 else up = up + 1 end
-                            end
-                        end
-                    end
-                end
-                percentUpdated = string.format('%.2f', (down / count * 100))
-                if '0.00' == percentUp then percentUpdated = '??' end   -- We are counting errors, and you can't get an error if you can't check anything.
-                                                                        -- TODO - try to account for this better, this is just a quick hack.
-            end
-            week = '<td>' .. percentUp .. '% up</td><td>' .. percentUpdated .. '% updated</td>'
-        end
-
-        web:write("<td>" .. ftp .. "&nbsp;</td><td>" .. http .. "&nbsp;</td><td>" .. https .. "&nbsp;</td><td>" .. rsync .. "&nbsp;</td><td>" .. dns ..
-                    "&nbsp;</td><td>" .. protocol .. "&nbsp;</td><td>" .. sanity .. "&nbsp;</td><td>" .. integrity .. "&nbsp;</td><td>" .. updated .. 
-                    "&nbsp;" .. spd .. "&nbsp;" .. week .."&nbsp;<td>" .. graph .. "</td></tr>\n")
-        if "" ~= active then
-            web:write("<tr><td style='background-color:dimgrey'>" .. active .. "</td></tr>\n")
-        end
-    end
-    web:write( "</table>\n<br>\n<h2>==== faulty mirrors: ====</h2>\n" .. faulty)
+    makeTable(web, APT.mirrors)
+    web:write( "<h2>==== faulty mirrors: ====</h2>\n" .. faulty)
     web:write( "<br>\n<br>\n<h2>==== DNS and logs: ====</h2>\n")
 
-    for k, v in pairs(APT.mirrors) do
-        local log = k
-        local n = {}
-        log = logCount(k)
-        APT.mirrors[k].Protocols = nil
-        APT.mirrors[k].FQDN = nil
-        APT.mirrors[k].Active = nil
-        APT.mirrors[k].Rate = nil
-        APT.mirrors[k].BaseURL = nil
-        APT.mirrors[k].Country = nil
-        APT.mirrors[k].Bandwidth = nil
-
-        for l, w in pairs(APT.mirrors[k].IPs) do
-            if type(w) == "table" then
-                n[l] = {}
-                for i, u in pairs(w) do
-                    local log = logCount(k, i)
-                    if "" == log then n[l][i] = u else n[l][log .. " " .. revDNS(APT.mirrors, k, i)] = u end
-                end
-            else
-                local log = logCount(k, l)
-                if "" == log then n[l] = w else n[log .. " " .. revDNS(APT.mirrors, k, l)] = w end
-            end
-        end
-        m[log .. " DNS entries -" .. redirs(APT.mirrors, k)] = n
-    end
+    m = makeIPlist(APT.mirrors)
     web:write(  "<p>This lists each mirror, and the DNS entries for that mirror. &nbsp; " ..
                 "The links point to the testing log files for " .. logCount("apt-panopticon") .. " for each domain name / IP combination that was tested. &nbsp; " ..
                 "If a mirror has a CNAME, that CNAME is listed along with that CNAMEs DNS entries. &nbsp; " ..
-                "deb.devuan.org is the DNS round robin, which points to the mirrors that are part of the DNS-RR. &nbsp; " ..
+                APT.options.roundRobin.value .. " is the DNS round robin, which points to the mirrors that are part of the DNS-RR. &nbsp; " ..
                 "If an IP is part of the DNS-RR, it is marked with '<font color='purple'><b>DNS-RR</b></font>' &nbsp; " ..
-                "pkgmaster.devuan.org is the master mirror, all the others sync to it. &nbsp; " ..
+                APT.options.referenceSite.value .. " is the master mirror, all the others sync to it. &nbsp; " ..
                 "</p>\n"
                 )
     web:write(APT.dumpTableHTML(m, ""))
@@ -499,106 +511,16 @@ if nil == web then C("opening mirrors file - " .. e) else
     results = {}
     m = {}
     faulty = ""
-    bg = ''
     web:write(  "<hr>\n<h2>==== Debian mirror status ====</h2>\n" ..
                 "<p>NOTE - This is not fully probing the Debian mirrors, we just collect some data from any redirects to other servers. &nbsp; " ..
                 "So this isn't a full set of tests. &nbsp Basically we don't know the shape of the Debian mirror infrastructure.</p>\n" ..
-                "<p><font style='background-color:red; color:black'>EXPERIMENTAL CODE - this is even more experimental than the rest.</font></p>\n" ..
-
-                "<table>\n<tr><th></th><th>" .. lnk('FTP') .. "</a></th><th>" .. lnk('HTTP') .. "</th><th>" .. lnk('HTTPS') .. "</th><th>" .. lnk('RSYNC') .. "</th>" .. 
-                "<th>" .. lnk('DNS round robin', 'DNS-RR') .. "</th><th>" .. lnk('Protocol') .. "</th><th>" .. lnk('URL sanity', 'URL-Sanity') .. "</th><th>" .. lnk('Integrity') .. "</th>" ..
-                "<th>" .. lnk('Updated') .. "</th><th colspan='2'>" .. lnk('Speed range', 'Speed') .. "</th>" ..
-                "<th colspan='2'>" .. lnk('Weekly statistics', 'Weekly') .. "</th><th>" .. lnk('Graphs') .. "</th></tr>\n"
+                "<p><font style='background-color:red; color:black'>EXPERIMENTAL CODE - this is even more experimental than the rest.</font></p>\n"
                 )
-    for k, v in APT.orderedPairs(APT.debians) do
-        if '' == bg then bg = " style='background-color:#111111'" else bg = '' end
-        local results = APT.collateAll(APT.debians, 'results', k)
-        local active = ""
-        if "yes" == v.Active then
-            web:write("     <tr " .. bg .. "><th>" .. k .. "</th> ")
-        else
-            if nil == v.Active then active = 'nil' else active = v.Active end
-            web:write("     <tr style='background-color:dimgrey'><th>" .. k .. "</th> ")
-        end
-        local ftp       = "<font color='grey'><b>skip</b></font>"
-        local http      = status(APT.debians, k, results, "http")
-        local https     = status(APT.debians, k, results, "https")
-        local rsync     = "<font color='grey'><b>skip</b></font>"
-        local dns       = ""
-        local protocol  = status(APT.debians, k, results, "Protocol")
-        local sanity    = status(APT.debians, k, results, "URLSanity")
-        local integrity = status(APT.debians, k, results, "Integrity")
-        local updated   = status(APT.debians, k, results, "Updated")
-        local rate = v.Rate
-        if nil ~= rate then updated = updated .. ' ' .. rate end
-        local min       = tonumber(results.speed.min)
-        local max       = tonumber(results.speed.max)
-        local spd       = '<td></td><td></td>'
-        local week      = '<td>??% up</td><td>??% updated</td>'
-        local graph     = '<a href="../apt-panopticon_cgp/host.php?h=' .. k .. '">graphs</a>'
-
-        -- DNS-RR test.
-        if ("deb.devuan.org" ~= k) and (nil ~= APT.debians["deb.devuan.org"]) then
-            APT.allpairs(APT.debians[k].IPs,
-                function(i, w, k, v)
-                    if nil ~= APT.mirrors["deb.devuan.org"].IPs["deb.roundr.devuan.org"][i] then
-                        local log = logCount("deb.devuan.org", i)
-                        if "" ~= log then
-                            if "" == dns then dns = " " else dns = dns .. " &nbsp; " end
-                            dns = dns .. logCount("deb.devuan.org", i)
-                        else
-                            if "" == dns then dns = " " else dns = dns .. " &nbsp; " end
-                            dns = dns .. "<font color='maroon'><b>" .. i .. "</b></font>"
-                        end
-                    end
-                end
-            )
-            if "" == dns then dns = "<font color='grey'><b>no</b></font>" end
-
-            if 0 == max then
-                spd = '<td></td><td></td>'
-            else
-                spd = string.format('<td align="right">%d -</td><td align="right">%d</td>', min, max)
-            end
-        end
-
-        web:write("<td>" .. ftp .. "&nbsp;</td><td>" .. http .. "&nbsp;</td><td>" .. https .. "&nbsp;</td><td>" .. rsync .. "&nbsp;</td><td>" .. dns ..
-                    "&nbsp;</td><td>" .. protocol .. "&nbsp;</td><td>" .. sanity .. "&nbsp;</td><td>" .. integrity .. "&nbsp;</td><td>" .. updated .. 
-                    "&nbsp;</td>" .. spd .. "&nbsp;" .. week .."&nbsp;<td>" .. graph .. "</td></tr>\n")
-        if "" ~= active then
-            web:write("<tr><td style='background-color:dimgrey'>" .. active .. "</td></tr>\n")
-        end
-    end
-    web:write( "</table>\n<br>\n\n")
 
+    makeTable(web, APT.debians)
     web:write( "<br>\n<br>\n<h2>==== Debian DNS and logs: ====</h2>\n")
 
-    for k, v in pairs(APT.debians) do
-        local log = k
-        local n = {}
-        log = logCount(k)
-        APT.debians[k].Protocols = nil
-        APT.debians[k].FQDN = nil
-        APT.debians[k].Active = nil
-        APT.debians[k].Rate = nil
-        APT.debians[k].BaseURL = nil
-        APT.debians[k].Country = nil
-        APT.debians[k].Bandwidth = nil
-        for l, w in pairs(APT.debians[k].IPs) do
-            if type(w) == "table" then
-                n[l] = {}
-                for i, u in pairs(w) do
-                    local log = logCount(k, i)
-                    if "" == log then n[l][i] = u else n[l][log .. " " .. revDNS(APT.debians, k, i)] = u end
-                end
-            else
-                local log = logCount(k, l)
-                if "" == log then n[l] = w else n[log .. " " .. revDNS(APT.debians, k, l)] = w end
-            end
-        end
-
-        m[log .. " DNS entries -" .. redirs(APT.mirrors, k)] = n
-    end
+    m = makeIPlist(APT.debians)
     web:write(APT.dumpTableHTML(m, ""))
 
     web:write( "<hr>\n<hr>\n<p>The <a href='Report-email.txt'>email report</a>. &nbsp; " ..