diff options
| author | onefang | 2019-11-13 22:10:32 +1000 |
|---|---|---|
| committer | onefang | 2019-11-13 22:10:32 +1000 |
| commit | 2d6e2f8a8b06399a6afdf1a73d4093adb0f07ea7 (patch) | |
| tree | 0e115f74b76c53980bade9e9e861b930e45073a7 | |
| parent | Polish the web page a bit. (diff) | |
| download | apt-panopticon-2d6e2f8a8b06399a6afdf1a73d4093adb0f07ea7.zip apt-panopticon-2d6e2f8a8b06399a6afdf1a73d4093adb0f07ea7.tar.gz apt-panopticon-2d6e2f8a8b06399a6afdf1a73d4093adb0f07ea7.tar.bz2 apt-panopticon-2d6e2f8a8b06399a6afdf1a73d4093adb0f07ea7.tar.xz | |
Some more sprucing up of the email and web reports.
| -rwxr-xr-x | apt-panopticon-report-email.lua | 9 | ||||
| -rwxr-xr-x | 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 | |||
| 171 | "The full list of Devuan package mirrors is available at the URL:\n\n" .. | 171 | "The full list of Devuan package mirrors is available at the URL:\n\n" .. |
| 172 | " https://pkgmaster.devuan.org/mirror_list.txt\n\n" .. | 172 | " https://pkgmaster.devuan.org/mirror_list.txt\n\n" .. |
| 173 | 'Please contact "mirrors@devuan.org" if any of the information \nin the file above needs to be amended. \n\n' .. | 173 | 'Please contact "mirrors@devuan.org" if any of the information \nin the file above needs to be amended. \n\n' .. |
| 174 | "The full results of the mirror checking is available at the URL:\n\n" .. | ||
| 175 | " https://sledjhamr.org/apt-panopticon/results/Report-web.html\n\n" .. | ||
| 174 | "Please see below the current status of the Devuan Package Mirror \nnetwork:\n\n" .. | 176 | "Please see below the current status of the Devuan Package Mirror \nnetwork:\n\n" .. |
| 175 | "---- BEGIN MIRROR-STATUS ----\n") | 177 | "---- BEGIN MIRROR-STATUS ----\n") |
| 176 | for k, v in orderedPairs(mirrors) do | 178 | for k, v in orderedPairs(mirrors) do |
| @@ -193,10 +195,11 @@ if nil == file then C("opening mirrors file - " .. e) else | |||
| 193 | local sanity = "[skip]" | 195 | local sanity = "[skip]" |
| 194 | local integrity = "[skip]" | 196 | local integrity = "[skip]" |
| 195 | local updated = "[skip]" | 197 | local updated = "[skip]" |
| 196 | file:write(" http: " .. http .. " https: " .. https .. " DNS-RR: " .. dns .. " Protocol: " .. protocol .. " URL-sanity: " .. sanity .. " Integrity: " .. integrity .. " Updated: " .. updated .. "\n") | 198 | file:write( " http: " .. http .. " https: " .. https .. " DNS-RR: " .. dns .. " Protocol: " .. protocol .. "\n" .. |
| 199 | " URL-sanity: " .. sanity .. " Integrity: " .. integrity .. " Updated: " .. updated .. "\n") | ||
| 197 | end | 200 | end |
| 198 | file:write( "==== faulty mirrors: ====\n\n" .. faulty) | 201 | file:write( "\n==== faulty mirrors: ====\n" .. faulty) |
| 199 | file:write( "---- END MIRROR-STATUS ----\n\n" .. | 202 | file:write( "\n---- END MIRROR-STATUS ----\n\n" .. |
| 200 | "Thanks for your precious help in ensuring that Devuan GNU+Linux \nremains a universal, stable, dependable, free operating system.\n\n" .. | 203 | "Thanks for your precious help in ensuring that Devuan GNU+Linux \nremains a universal, stable, dependable, free operating system.\n\n" .. |
| 201 | "Love\n\n" .. | 204 | "Love\n\n" .. |
| 202 | "The Dev1Devs\n\n") | 205 | "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 = {} | |||
| 190 | 190 | ||
| 191 | local file, e = io.open("results/Report-web.html", "w+") | 191 | local file, e = io.open("results/Report-web.html", "w+") |
| 192 | if nil == file then C("opening mirrors file - " .. e) else | 192 | if nil == file then C("opening mirrors file - " .. e) else |
| 193 | file:write( "<html><head>\n" .. | 193 | file:write( "<html><head><title>apt-panopticon results</title>\n" .. |
| 194 | '</head><body bgcolor="black" text="white" alink="red" link="blue" vlink="purple">' .. | 194 | '</head><body bgcolor="black" text="white" alink="red" link="blue" vlink="purple">' .. |
| 195 | "<h1>Welcome to the apt-opticon results page.</h1>\n" .. | ||
| 195 | "<p>Check time: " .. os.date("!%a %b %d %T %Z %Y") .. "</p>\n" .. | 196 | "<p>Check time: " .. os.date("!%a %b %d %T %Z %Y") .. "</p>\n" .. |
| 196 | "<p>The full list of Devuan package mirrors is available at the URL: " .. | 197 | "<p>The full list of Devuan package mirrors is available at the URL: " .. |
| 197 | "<a href='https://pkgmaster.devuan.org/mirror_list.txt'>https://pkgmaster.devuan.org/mirror_list.txt</a><br>\n" .. | 198 | "<a href='https://pkgmaster.devuan.org/mirror_list.txt'>https://pkgmaster.devuan.org/mirror_list.txt</a><br>\n" .. |
| @@ -268,6 +269,9 @@ if nil == file then C("opening mirrors file - " .. e) else | |||
| 268 | "</p>\n" | 269 | "</p>\n" |
| 269 | ) | 270 | ) |
| 270 | file:write(dumpTableHTML(m, "", "")) | 271 | file:write(dumpTableHTML(m, "", "")) |
| 271 | file:write( "\n<br>\n\n</body></html>\n") | 272 | file:write( "\n<br>\n\n" .. |
| 273 | "<p>The <a href='Report-email.txt'>email report</a>.</p>" .. | ||
| 274 | "<p>All <a href='../results'>the logs and other output</a>.</p>" .. | ||
| 275 | "</body></html>\n") | ||
| 272 | file:close() | 276 | file:close() |
| 273 | end | 277 | end |