1 files changed, 53 insertions, 35 deletions

diff --git a/apt-panopticon-report-email-web.lua b/apt-panopticon-report-email-web.lua
index b21ba8a..2a13975 100755
--- a/apt-panopticon-report-email-web.lua
+++ b/apt-panopticon-report-email-web.lua
@@ -18,11 +18,13 @@ APT.debians = loadfile("results/debians.lua")()
 local revDNS = function(hosts, dom, IP)
     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
-                    return "DNS-RR"
+            if nil ~= hosts[APT.options.roundRobin.value].IPs[APT.options.roundRobinCname.value] then
+                if nil ~= hosts[APT.options.roundRobin.value].IPs[APT.options.roundRobinCname.value][IP] then
+                    if APT.html then
+                        return "<font color='purple'><b>DNS-RR</b></font>"
+                    else
+                        return "DNS-RR"
+                    end
                 end
             end
         end
@@ -87,6 +89,7 @@ local status = function(hosts, host, results, typ)
 
     if to then
         result = "TIMEOUT"
+        hosts[host].passed = false;
         if not s then result = result .. "*" end
         if APT.html then
             if s then
@@ -102,6 +105,7 @@ local status = function(hosts, host, results, typ)
         end
     elseif 0 < e then
         result = "FAILED"
+        hosts[host].passed = false;
         if not s then result = result .. "*" end
         if APT.html then
             if s then
@@ -198,24 +202,28 @@ local DNSrrTest = function(hosts, k)
         space = ' &nbsp; '
         no = "<font color='grey'><b>no</b></font>"
     end
-    if (APT.options.roundRobin.value ~= k) and (nil ~= hosts[APT.options.roundRobin.value]) and (nil ~= hosts[k].IPs) then
+    if (APT.options.roundRobin.value ~= k) and (nil ~= hosts[APT.options.roundRobin.value]) and (nil ~= hosts[k].IPs) and ("no" ~= hosts[k].DNSRR) 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
+--              if nil ~= hosts[APT.options.roundRobin.value].IPs[APT.options.roundRobinCname.value] then
+--                  if nil ~= hosts[APT.options.roundRobin.value].IPs[APT.options.roundRobinCname.value][i] then
+                        local log = logCount(APT.options.roundRobin.value, i)
+                        local inRR = "<font color='green'><b>&#x2705;</b></font>"
+                        if nil ~= log:find("<font color='") then inRR = "<font color='red'>&#x274c;</font>" end
+                        if "" ~= log then
+                            if "" == dns then dns = " " else dns = dns .. space end
+                            dns = dns .. inRR .. 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 .. inRR .. i
+                        end
+--                  end
+--              end
             end
         )
-        if "" == dns then dns = no end
     end
+    if "" == dns then dns = no end
     return dns
 end
 
@@ -242,6 +250,7 @@ local makeTable = function(web, hosts)
             if nil == v.Active then active = 'nil' else active = v.Active end
             web:write("     <tr style='background-color:dimgrey'><th>" .. k .. "</th> ")
         end
+        hosts[k].passed = true;
         local inRR      = "<font color='green'><b>&#x2705;</b></font>"
         local ftp       = "<font color='grey'><b>skip</b></font>"
         local http      = status(hosts, k, results, "http")
@@ -260,14 +269,7 @@ local makeTable = function(web, hosts)
         local week      = '<td>&nbsp;</td><td>&nbsp;</td>'
         if nil == rate then rate = '' end
 
-        -- DNS-RR test.
---      if nil == http:         find('OK') then inRR = "<font color='red'>&#x274c;</font>" end
---      if nil == https:        find('OK') then inRR = "<font color='red'>&#x274c;</font>" end
---      if nil == protocol:     find('OK') then inRR = "<font color='red'>&#x274c;</font>" end
---      if nil == redirects:    find('OK') then inRR = "<font color='red'>&#x274c;</font>" end
---      if nil == sanity:       find('OK') then inRR = "<font color='red'>&#x274c;</font>" end
---      if nil == integrity:    find('OK') then inRR = "<font color='red'>&#x274c;</font>" end
---      if nil == updated:      find('OK') then inRR = "<font color='red'>&#x274c;</font>" end
+        if not hosts[k].passed then inRR = "<font color='red'>&#x274c;</font>" end
 
         if (APT.options.roundRobin.value ~= k) and (nil ~= hosts[APT.options.roundRobin.value]) then
             if 0 == max then
@@ -319,8 +321,10 @@ local makeTable = function(web, hosts)
             week = '<td>&nbsp;' .. percentUp .. '% up</td><td>&nbsp;' .. percentUpdated .. '% updated</td>'
 --          if ('100.00' ~= percentUp) or ('100.00' ~= percentUpdated) then inRR = "<font color='red'>&#x274c;</font>" end
         end
+        if "yes"   ~= hosts[k].DNSRR then inRR = " &nbsp; &nbsp; " end
+        if "maybe" == hosts[k].DNSRR then inRR = "<font color='red'>&#x2753;</font>" end
 
-        web:write("<td>" .. ftp .. "&nbsp;</td><td>" .. http .. "&nbsp;</td><td>" .. https .. "&nbsp;</td><td>" .. rsync .. "&nbsp;</td><td>" .. dns ..
+        web:write("<td>" .. ftp .. "&nbsp;</td><td>" .. http .. "&nbsp;</td><td>" .. https .. "&nbsp;</td><td>" .. rsync .. "&nbsp;</td><td>" .. inRR .. " " .. dns ..
                     "&nbsp;</td><td>" .. protocol .. "&nbsp;</td><td>" .. redirects .. "&nbsp;</td><td>" .. sanity .. "&nbsp;</td><td>" .. integrity .. "&nbsp;</td>" .. '<td>' .. rate ..
                     '</td><td>' ..  updated .. '</td>&nbsp;' .. spd .. "&nbsp;" .. week .."&nbsp;</tr>\n")
         if "" ~= active then
@@ -360,15 +364,14 @@ local makeIPlist = function(hosts)
         if nil ~= hosts[k].IPs then
             for l, w in pairs(hosts[k].IPs) do
                 if type(w) == "table" then
--- TODO - don't hard code deb.roundr.devuan.org.
                     -- Don't output the extra DNS-RR entries that are for admin reasons.
-                    if ((APT.options.roundRobin.value == k) and ("deb.roundr.devuan.org" == l)) or (APT.options.roundRobin.value ~= k) then 
+                    if ((APT.options.roundRobin.value == k) and (APT.options.roundRobinCname.value == l)) or (APT.options.roundRobin.value ~= k) then 
                         n[l] = {}
                         for i, u in pairs(w) do
                             if (APT.testing("IPv6") and ("AAAA" == u)) or ("A" == u) then
                                 local inRR = ""
                                 local lc = logCount(k, i)
-                                if checkRR then
+                                if checkRR and ('no' ~= hosts[k].DNSRR) then
                                     -- If there where errors, warnings, or timeouts, then it'll have that wrapped in font tags.
                                     inRR        = "<font color='green'><b>&#x2705;</b></font>"
                                     if nil ~= lc:find("<font color='") then
@@ -382,7 +385,8 @@ local makeIPlist = function(hosts)
                                         if f == nil then C("writing DNS-RR_good.txt file - " .. e) end
                                     end
                                 end
-                                if "yes" ~= hosts[k].DNSRR then inRR = "" end
+                                if "maybe" == hosts[k].DNSRR then inRR = "<font color='red'>&#x2753;</font>" end
+                                if "no"    == hosts[k].DNSRR then inRR = "" end
                                 local log = '[<a href="' .. adr .. k .. '_' .. i .. '">graphs</a>] &nbsp; '
                                 if "" == log then n[l][i] = u else n[l][log .. inRR .. ' ' .. revDNS(hosts, k, i) .. ' ' .. lc] = u end
                             end
@@ -392,7 +396,7 @@ local makeIPlist = function(hosts)
                     if (APT.testing("IPv6") and ("AAAA" == w)) or ("A" == w) then
                         local inRR      = ""
                         local lc = logCount(k, l)
-                        if checkRR then
+                        if checkRR and ('no' ~= hosts[k].DNSRR) then
                             -- If there where errors, warnings, or timeouts, then it'll have that wrapped in font tags.
                             inRR        = "<font color='green'><b>&#x2705;</b></font>"
                             if nil ~= lc:find("<font color='") then
@@ -406,7 +410,8 @@ local makeIPlist = function(hosts)
                                 if f == nil then C("writing DNS-RR_good.txt file - " .. e) end
                             end
                         end
-                        if "yes" ~= hosts[k].DNSRR then inRR = "" end
+                        if "maybe" == hosts[k].DNSRR then inRR = "<font color='red'>&#x2753;</font>" end
+                        if "no"    == hosts[k].DNSRR then inRR = "" end
                         local log = '[<a href="' .. adr .. k .. '_' .. l .. '">graphs</a>] &nbsp; '
                         if "" == log then n[l] = w else n[log .. inRR .. ' ' .. revDNS(hosts, k, l) .. ' ' .. lc] = w end
                     end
@@ -512,6 +517,17 @@ local colours =
     '00880080',
     '00088080',
     '00008880',
+    '80000080',
+    '08000080',
+    '00800080',
+    '00080080',
+    '00008080',
+    '00000880',
+    'fff00080',
+    '0fff0080',
+    '00fff080',
+    '000fff80',
+    '0000fff0',
 }
 local g = {}
 local count = 0
@@ -526,6 +542,7 @@ for k, v in APT.orderedPairs(mirrors) do
     if APT.options.roundRobin.value ~= k then
         local c = colours[count]
         local name = string.format('%32s', k)
+        if c == nil 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')
@@ -576,7 +593,8 @@ if nil == web then C("opening mirrors file - " .. e) else
                 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>'," ..
                 " if it <a href='DNS-RR_good.txt'>should be</a> it is marked with '<font color='green'><b>&#x2705;</b></font>'," ..
-                " if it <a href='DNS-RR_bad.txt'>should not be</a> it is marked with '<font color='red'>&#x274c;</font>'. &nbsp; " ..
+                " if it <a href='DNS-RR_bad.txt'>should not be</a> it is marked with '<font color='red'>&#x274c;</font>'," ..
+                " if it might be but still pending full testing, it is marked with '<font color='red'>&#x2753;</font>'. &nbsp; " ..
                 "<br>" ..
                 APT.options.referenceSite.value .. " is the master mirror, all the others copy files from it. &nbsp; " ..
                 "</p>\n"
@@ -608,7 +626,7 @@ if nil == web then C("opening mirrors file - " .. e) else
                 "and <a href='https://git.devuan.dev/onefang/apt-panopticon_cgp'>here (Devuan repo)</a>.</p>\n"
                 )
     local whn = APT.exe('TZ="GMT" ls -dl1 --time-style="+%s" results/stamp | cut -d " " -f 6-6'):Do().result:sub(2, -2)
-    web:write(  "<p>This run took " .. (os.time() - tonumber("0" .. whn)) .. " seconds.</p>" ..
+    web:write(  "<p>This run took " .. (os.time() - tonumber("0" .. whn)) .. " seconds. &nbsp &nbsp apt-panopticon version " .. APT.version ..  "  </p>" ..
                 "\n</body></html>\n")
     web:close()
 end