From: Ian Kelling Date: Fri, 15 Sep 2023 23:34:45 +0000 (-0400) Subject: fixes X-Git-Url: https://iankelling.org/git/?a=commitdiff_plain;h=76e48ba447b07a216b6dc8786617bb0d6544858d;p=distro-setup fixes --- diff --git a/mail-setup b/mail-setup index 667f0ec..baca1fc 100755 --- a/mail-setup +++ b/mail-setup @@ -3010,11 +3010,12 @@ EOF # ** $MAIL_HOST) $MAIL_HOST) - - + if [[ ! -e /etc/exim4/no-delay-eximids ]]; then + install -o iank -g iank <(echo) /etc/exim4/no-delay-eximids + fi u /etc/exim4/conf.d/router/155_delay <<'EOF' -By default, delay sending email by 30-40 minutes in case I -change my mind. +# By default, delay sending email by 30-40 minutes in case I +# change my mind. # Note, if we switch mail_host, the next queue run will # send the message to mail_host and the delay will be reset. diff --git a/system-status b/system-status index fdf4758..b31032c 100755 --- a/system-status +++ b/system-status @@ -127,48 +127,43 @@ write-status() { ## check if last snapshot was recent old_snap_limit=$(( 3 * 60 * 60 )) - for vol in a o q; do - case $vol in - o) btrbk_root=/mnt/o/btrbk ;; - *) btrbk_root=/mnt/root/btrbk ;; - esac - # this section generally copied from btrbk scripts, but - # this part modified to speed things up by about half a second. - # I'm not sure if its quite as reliable, but it looks pretty safe. - # Profiled it using time and also adding to the top of the file: - # set -x - # PS4='+ $(date "+%2N") ' - # allow failure in case there are no snapshots yet. - # shellcheck disable=SC2012 - shopt -s nullglob - files=($btrbk_root/$vol.20*) - shopt -u nullglob - if (( ! ${#files[@]} )); then - continue - fi - snaps=($(ls -1avdr "${files[@]}" 2>/dev/null |head -n1 || : )) - now=$EPOCHSECONDS - maxtime=0 - for s in ${snaps[@]}; do - file=${s##*/} - t=$(date -d $(sed -r 's/(.{4})(..)(.{5})(..)(.*)/\1-\2-\3:\4:\5/' <<<${file#$vol.}) +%s) - if (( t > maxtime )); then - maxtime=$t - fi - done - snapshotmsg= - last_snap_age=$(( now - maxtime )) - last_snap_hours=$(( last_snap_age / 60 / 60 )) - if (( last_snap_age > old_snap_limit )); then - chars+=(OLD-SNAP-${last_snap_hours}h) - snapshotmsg="/$vol snapshot older than 4 hours" - if [[ $MAIL_HOST == "$HOSTNAME" ]]; then - p "$snapshotmsg" | lo -1 old-snapshot - fi - # not bothering to get info on all volumes if we find an old one. - break + vol=o + btrbk_root=/mnt/o/btrbk + # this section generally copied from btrbk scripts, but + # this part modified to speed things up by about half a second. + # I'm not sure if its quite as reliable, but it looks pretty safe. + # Profiled it using time and also adding to the top of the file: + # set -x + # PS4='+ $(date "+%2N") ' + # allow failure in case there are no snapshots yet. + # shellcheck disable=SC2012 + shopt -s nullglob + files=($btrbk_root/$vol.20*) + shopt -u nullglob + if (( ! ${#files[@]} )); then + continue + fi + snaps=($(ls -1avdr "${files[@]}" 2>/dev/null |head -n1 || : )) + now=$EPOCHSECONDS + maxtime=0 + for s in ${snaps[@]}; do + file=${s##*/} + t=$(date -d $(sed -r 's/(.{4})(..)(.{5})(..)(.*)/\1-\2-\3:\4:\5/' <<<${file#$vol.}) +%s) + if (( t > maxtime )); then + maxtime=$t fi done + snapshotmsg= + last_snap_age=$(( now - maxtime )) + last_snap_hours=$(( last_snap_age / 60 / 60 )) + if (( last_snap_age > old_snap_limit )); then + chars+=(OLD-SNAP-${last_snap_hours}h) + snapshotmsg="/$vol snapshot older than 4 hours" + if [[ $MAIL_HOST == "$HOSTNAME" ]]; then + p "$snapshotmsg" | lo -1 old-snapshot + fi + # not bothering to get info on all volumes if we find an old one. + fi if [[ $MAIL_HOST == "$HOSTNAME" ]]; then