alerting fixes

diff --git a/mail-setup b/mail-setup
index 690d17daa941028f46bbf8564f7a18fdcbe81fa5..c313c46da685e41f4381bcadbb9cee071df3be50 100755 (executable)
--- a/mail-setup
+++ b/mail-setup
@@ -544,7 +544,7 @@ EOF
   cat >$f <<'EOF'
 #!/bin/bash
 cd /etc
-wget -nv -N https://publicsuffix.org/list/public_suffix_list.dat
+wget -q -N https://publicsuffix.org/list/public_suffix_list.dat
 EOF
   chmod 755 $f
 
@@ -892,9 +892,9 @@ EOF
   cat >/etc/cron.d/mailtest <<EOF
 SHELL=/bin/bash
 # running as user just because no need to run as root
-*/10 * * * *   $u $f 2>&1 | log-once send-test-forward
-*/10 * * * *   $u /usr/local/bin/mailtest-check 2>&1 | log-once -1 send-test-forward
-*/10 * * * *   root chmod -R g+rw /m/md/bounces 2>&1 | log-once -1 bounces-chmod
+*/10 * * * *   $u $f 2>&1 | /usr/local/bin/log-once send-test-forward
+*/10 * * * *   $u /usr/local/bin/mailtest-check 2>&1 | /usr/local/bin/log-once -1 send-test-forward
+*/10 * * * *   root chmod -R g+rw /m/md/bounces 2>&1 | /usr/local/bin/log-once -1 bounces-chmod
 EOF
   cp /a/bin/distro-setup/filesystem/usr/local/bin/mailtest-check /usr/local/bin
 else

diff --git a/system-status b/system-status
index a36240ca24c631296d5d944da3a6d2251ab02c87..78d0fdaec1628894869d7459a6712994352053b8 100755 (executable)
--- a/system-status
+++ b/system-status
@@ -25,7 +25,7 @@ write-status() {
   if [[ -e $glob ]]; then
     chars+=("BOUNCE!")
   fi
-  glob=(/m/md/alerts/new/*)
+  glob=(/m/md/alerts/new/* /m/md/alerts/cur/*)
   if [[ -e $glob ]]; then
     chars+=("ALERT!")
   fi