From 2d6e2f8a8b06399a6afdf1a73d4093adb0f07ea7 Mon Sep 17 00:00:00 2001
From: onefang
Date: Wed, 13 Nov 2019 22:10:32 +1000
Subject: Some more sprucing up of the email and web reports.
---
apt-panopticon-report-email.lua | 9 ++++++---
apt-panopticon-report-web.lua | 8 ++++++--
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/apt-panopticon-report-email.lua b/apt-panopticon-report-email.lua
index e157dc1..024c32b 100755
--- a/apt-panopticon-report-email.lua
+++ b/apt-panopticon-report-email.lua
@@ -171,6 +171,8 @@ if nil == file then C("opening mirrors file - " .. e) else
"The full list of Devuan package mirrors is available at the URL:\n\n" ..
" https://pkgmaster.devuan.org/mirror_list.txt\n\n" ..
'Please contact "mirrors@devuan.org" if any of the information \nin the file above needs to be amended. \n\n' ..
+ "The full results of the mirror checking is available at the URL:\n\n" ..
+ " https://sledjhamr.org/apt-panopticon/results/Report-web.html\n\n" ..
"Please see below the current status of the Devuan Package Mirror \nnetwork:\n\n" ..
"---- BEGIN MIRROR-STATUS ----\n")
for k, v in orderedPairs(mirrors) do
@@ -193,10 +195,11 @@ if nil == file then C("opening mirrors file - " .. e) else
local sanity = "[skip]"
local integrity = "[skip]"
local updated = "[skip]"
- file:write(" http: " .. http .. " https: " .. https .. " DNS-RR: " .. dns .. " Protocol: " .. protocol .. " URL-sanity: " .. sanity .. " Integrity: " .. integrity .. " Updated: " .. updated .. "\n")
+ file:write( " http: " .. http .. " https: " .. https .. " DNS-RR: " .. dns .. " Protocol: " .. protocol .. "\n" ..
+ " URL-sanity: " .. sanity .. " Integrity: " .. integrity .. " Updated: " .. updated .. "\n")
end
- file:write( "==== faulty mirrors: ====\n\n" .. faulty)
- file:write( "---- END MIRROR-STATUS ----\n\n" ..
+ file:write( "\n==== faulty mirrors: ====\n" .. faulty)
+ file:write( "\n---- END MIRROR-STATUS ----\n\n" ..
"Thanks for your precious help in ensuring that Devuan GNU+Linux \nremains a universal, stable, dependable, free operating system.\n\n" ..
"Love\n\n" ..
"The Dev1Devs\n\n")
diff --git a/apt-panopticon-report-web.lua b/apt-panopticon-report-web.lua
index 75f2895..1981def 100755
--- a/apt-panopticon-report-web.lua
+++ b/apt-panopticon-report-web.lua
@@ -190,8 +190,9 @@ local m = {}
local file, e = io.open("results/Report-web.html", "w+")
if nil == file then C("opening mirrors file - " .. e) else
- file:write( "\n" ..
+ file:write( "apt-panopticon results\n" ..
'' ..
+ "Welcome to the apt-opticon results page.
\n" ..
"Check time: " .. os.date("!%a %b %d %T %Z %Y") .. "
\n" ..
"The full list of Devuan package mirrors is available at the URL: " ..
"https://pkgmaster.devuan.org/mirror_list.txt
\n" ..
@@ -268,6 +269,9 @@ if nil == file then C("opening mirrors file - " .. e) else
"
\n"
)
file:write(dumpTableHTML(m, "", ""))
- file:write( "\n
\n\n\n")
+ file:write( "\n
\n\n" ..
+ "The email report.
" ..
+ "All the logs and other output.
" ..
+ "\n")
file:close()
end
--
cgit v1.1