Heavy modifications to {mirror,sbosrcarch}-wrapper scripts.

This commit is contained in:
Darren 'Tadgy' Austin 2026-10-15 15:03:55 +01:00
commit 13d2548ac5
2 changed files with 104 additions and 62 deletions

View file

@ -8,15 +8,16 @@ MIRRORING_USER='SLACKWAREUKINT\mirroring'
DEPOSITORY_GROUP='SLACKWAREUKINT\depository' DEPOSITORY_GROUP='SLACKWAREUKINT\depository'
LOGSDIR="/var/log/duplication/mirroring/$(printf "%(%Y/%m)T")" LOGSDIR="/var/log/duplication/mirroring/$(printf "%(%Y/%m)T")"
LOGFILE="$(printf "%(%Y%m%d-%H%M%S)T")-$$" LOGFILE="$(printf "%(%Y%m%d-%H%M%S)T")-$$"
MIN_LOGFILE_SIZE="845" # Used to prevent unnecessary emails - only messages over this size are sent. MIN_LOGFILE_SIZE="1210" # Used to prevent unnecessary emails - only messages over this size are sent.
# Where from/to to send emails. Comment for no emailing. # Where from/to to send emails. Comment for no emailing.
EMAIL_FROM="\"Server: ${HOSTNAME%%.*}\" <noreply@slackware.uk.net>" EMAIL_FROM="\"Server: ${HOSTNAME%%.*}\" <noreply@slackware.uk.net>"
EMAIL_TO=("Systems' Administrator <sysadmin@slackware.uk>") EMAIL_TO=("Systems' Administrator <sysadmin@slackware.uk>")
# Functions # Functions.
notify() { notify() {
[[ -n "$EMAIL_FROM" ]] && (( "${#EMAIL_TO[@]}" != 0 )) && { [[ -n "$EMAIL_FROM" ]] && (( "${#EMAIL_TO[@]}" != 0 )) && {
printf "%s: %s\\n%s: %s\\n%s:\\n%s\\n" "Exit code" "$ERR" "Logfile" "$LOGSDIR/$LOGFILE.xz" "Output" "$(cat "$LOGSDIR/$LOGFILE" | sed -re 's/^/ /g')" | mail -r "$EMAIL_FROM" -s "Mirroring $1" "${EMAIL_TO[@]}" >/dev/null 2>&1 || { # shellcheck disable=SC2094
printf "%s: %s\\n%s: %s\\n%s:\\n%s\\n" "Exit code" "$ERR" "Logfile" "$LOGSDIR/$LOGFILE.xz" "Output" "$(sed -re 's/^/ /g' <"$LOGSDIR/$LOGFILE")" | mail -r "$EMAIL_FROM" -s "Mirroring $1" "${EMAIL_TO[@]}" >>"$LOGSDIR/$LOGFILE" 2>&1 || {
printf "%s: %s\\n" "${0##*/}" "mail command failed" >&2 printf "%s: %s\\n" "${0##*/}" "mail command failed" >&2
return 1 return 1
} }
@ -31,7 +32,7 @@ umask 027
# Only run for the configured mirroring user. # Only run for the configured mirroring user.
[[ "$(whoami)" != "$MIRRORING_USER" ]] && { [[ "$(whoami)" != "$MIRRORING_USER" ]] && {
printf "%s: %s\\n" "${0##*/}" "must be run by the '$MIRRORING_USER' user" >&2 printf "%s: %s\\n" "${0##*/}" "must be run by the '$MIRRORING_USER' user" >&2
printf "%s: %s: %s\\n" "${0##*/}" "to run manually:" "su '$MIRRORING_USER' $0 $@" >&2 printf "%s: %s: %s\\n" "${0##*/}" "to run manually:" "su '$MIRRORING_USER' -c \"$0 $*\"" >&2
exit 1 exit 1
} }
@ -63,45 +64,64 @@ if [[ "$FLOCK" != "$0" ]]; then
fi fi
fi fi
# Drop the caches as sometimes old user/groups are cached. ERR=0
sudo /opt/sbin/drop-caches
# Make sure there's no errant ownerships. # Make sure there's no errant ownerships.
printf "%s: %s\\n" "INFO" "Scanning depository directory for correct ownerships/permissions" | tee "$LOGSDIR/$LOGFILE" [[ $(printf "%(%H)T") =~ (02|08|14|20) ]] && {
GLOBIGNORE="$DEPOSITORY/sbosrcarch" printf "%s: %s\\n" "INFO" "Scanning depository directory for correct ownerships/permissions" | tee "$LOGSDIR/$LOGFILE"
WRONG="$(find "$DEPOSITORY/"* \( \
\( \( -type b -o -type c -o -type p -o -type s \) -a \! -path "$DEPOSITORY/slackware/slackware-3.0/disk1/live/dev/*" \) -o \ # Drop the caches as sometimes old user/groups are cached.
\( -type l -a \! -perm 777 \) -o \ sudo /opt/sbin/drop-caches
\( -type d -a \! -perm 755 -a \! -perm 2755 \) -o \
\( -type f -a \! -perm 644 -a \! -perm 755 \) -o \ # Scan files.
\( \! -user "$MIRRORING_USER" \) -o \ GLOBIGNORE="$DEPOSITORY/sbosrcarch"
\( \! -group "$DEPOSITORY_GROUP" \) \ WRONG="$(find "$DEPOSITORY/"* -not -name .rsync-tmp -a \( \
\( \( -type b -o -type c -o -type p -o -type s \) -a -not -path "$DEPOSITORY/slackware/slackware-3.0/disk1/live/dev/*" \) -o \
\( -type l -a -not -perm 777 \) -o \
\( -type d -a -not -perm 755 -a -not -perm 2755 \) -o \
\( -type f -a -not -perm 644 -a -not -perm 755 \) -o \
\( -not -user "$MIRRORING_USER" \) -o \
\( -not -group "$DEPOSITORY_GROUP" \) \
\) -a -printf "%u:%g\t%M\t%p\n")" \) -a -printf "%u:%g\t%M\t%p\n")"
if [[ -n "$WRONG" ]]; then
# Report findings.
if [[ -n "$WRONG" ]]; then
printf "%s: %s\\n" "ERROR" "This sync has been aborted!" | tee -a "$LOGSDIR/$LOGFILE" printf "%s: %s\\n" "ERROR" "This sync has been aborted!" | tee -a "$LOGSDIR/$LOGFILE"
printf "%s: %s\\n" "WARNING" "The following paths have erronious ownerships/permissions:" | tee -a "$LOGSDIR/$LOGFILE" printf "%s: %s\\n" "ERROR" "The following paths have erronious ownerships/permissions:" | tee -a "$LOGSDIR/$LOGFILE"
printf "%s\\n" "$WRONG" | sed -re 's/^/ /g' | tee -a "$LOGSDIR/$LOGFILE" printf "%s\\n" "$WRONG" | sed -re 's/^/ /g' | tee -a "$LOGSDIR/$LOGFILE"
ERR=-1 ERR=-1
else else
printf "%s: %s\\n" "INFO" "No ownership/permission issues found" | tee -a "$LOGSDIR/$LOGFILE" printf "%s: %s\\n" "INFO" "No ownership/permission issues found" | tee -a "$LOGSDIR/$LOGFILE"
# Do the mirroring work. fi
}
# Do the mirroring work.
(( ERR == 0 )) && {
umask 022 umask 022
export MIRRORING_USER export MIRRORING_USER
printf "%s: %s: %s\\n" "INFO" "Beginning sync command" "sg \"$DEPOSITORY_GROUP\" -c \"$COMMAND $@\"" | tee -a "$LOGSDIR/$LOGFILE" printf "%s: %s: %s\\n" "INFO" "Beginning sync command" "sg \"$DEPOSITORY_GROUP\" -c \"$COMMAND $*\"" | tee -a "$LOGSDIR/$LOGFILE"
sg "$DEPOSITORY_GROUP" -c "$COMMAND $@" 2>&1 | tee -a "$LOGSDIR/$LOGFILE" sg "$DEPOSITORY_GROUP" -c "$COMMAND $* 2>&1" | tee -a "$LOGSDIR/$LOGFILE"
ERR="$?" ERR="$?"
fi }
# Tell the sysadmin what went on. # Tell the sysadmin what went on.
if (( "$ERR" == 0 )); then if (( ERR == 0 )); then
# Only email a mirroring report if it's not the hourly Slackware tree only run. # Only email a mirroring report if it's not the hourly Slackware tree only run.
# The size of the log file determines if it gets emailed. # The size of the log file determines if it gets emailed.
(( $(stat --printf="%s" "$LOGSDIR/$LOGFILE") > MIN_LOGFILE_SIZE )) && notify "report" (( $(stat --printf="%s" "$LOGSDIR/$LOGFILE") > MIN_LOGFILE_SIZE )) && {
ERR="$?" notify "report" || {
[[ -x /opt/bin/pushover-client ]] && /opt/bin/pushover-client "mirroring" -p -1 -s "notify() failure" -m "Check logfile: $LOGSDIR/$LOGFILE"
}
}
else else
# Mirroring failed, tell the admin.
notify "failure" || [[ -x /opt/bin/pushover-client ]] && /opt/bin/pushover-client "mirroring" -p -1 -s "Mirroring failure" -m "Check log in email"
ERR="1" ERR="1"
# Mirroring failed, tell the admin.
if notify "failure"; then
[[ -x /opt/bin/pushover-client ]] && /opt/bin/pushover-client "mirroring" -p -1 -s "Mirroring failure" -m "Check email / logfile: $LOGSDIR/$LOGFILE"
else
[[ -x /opt/bin/pushover-client ]] && /opt/bin/pushover-client "mirroring" -p -1 -s "notify() failure" -m "Check logfile: $LOGSDIR/$LOGFILE"
fi
fi fi
# Compress the log to save some space. # Compress the log to save some space.

View file

@ -16,7 +16,8 @@ EMAIL_CC=("Urchlay <urchlay@slackware.uk>")
# Functions # Functions
notify() { notify() {
[[ -n "$EMAIL_FROM" ]] && (( "${#EMAIL_TO[@]}" != 0 )) && { [[ -n "$EMAIL_FROM" ]] && (( "${#EMAIL_TO[@]}" != 0 )) && {
printf "%s: %s\\n%s: %s\\n%s:\\n%s\\n" "Exit code" "$ERR" "Logfile" "$LOGSDIR/$LOGFILE.xz" "Output" "$(cat "$LOGSDIR/$LOGFILE" | sed -re 's/^/ /g')" | mail -r "$EMAIL_FROM" -s "SboSrcArch $1" "$(for i in $(seq -s ' ' 0 $(( ${#EMAIL_CC[@]} -1 ))); do echo ${EMAIL_CC[$i]:+-c "${EMAIL_CC[$i]}"}; done)" "${EMAIL_TO[@]}" >/dev/null 2>&1 || { # shellcheck disable=SC2094
printf "%s: %s\\n%s: %s\\n%s:\\n%s\\n" "Exit code" "$ERR" "Logfile" "$LOGSDIR/$LOGFILE.xz" "Output" "$(sed -re 's/^/ /g' <"$LOGSDIR/$LOGFILE")" | mail -r "$EMAIL_FROM" -s "SboSrcArch $1" "$(for i in $(seq -s ' ' 0 $(( ${#EMAIL_CC[@]} -1 ))); do echo ${EMAIL_CC[$i]:+-c "${EMAIL_CC[$i]}"}; done)" "${EMAIL_TO[@]}" >>"$LOGSDIR/$LOGFILE" 2>&1 || {
printf "%s: %s\\n" "${0##*/}" "mail command failed" >&2 printf "%s: %s\\n" "${0##*/}" "mail command failed" >&2
return 1 return 1
} }
@ -31,7 +32,7 @@ umask 027
# Only run for the configured sbosrcarch user. # Only run for the configured sbosrcarch user.
[[ "$(whoami)" != "$SBOSRCARCH_USER" ]] && { [[ "$(whoami)" != "$SBOSRCARCH_USER" ]] && {
printf "%s: %s\\n" "${0##*/}" "must be run by the '$SBOSRCARCH_USER' user" >&2 printf "%s: %s\\n" "${0##*/}" "must be run by the '$SBOSRCARCH_USER' user" >&2
printf "%s: %s: %s\\n" "${0##*/}" "to run manually:" "su '$SBOSRCARCH_USER' $0 $@" >&2 printf "%s: %s: %s\\n" "${0##*/}" "to run manually:" "su \"$SBOSRCARCH_USER\" -c \"$0 $*\"" >&2
exit 1 exit 1
} }
@ -63,12 +64,17 @@ if [[ "$FLOCK" != "$0" ]]; then
fi fi
fi fi
# Drop the caches as sometimes old user/groups are cached. ERR=0
sudo /opt/sbin/drop-caches
# Make sure there's no errant ownerships. # Make sure there's no errant ownerships.
printf "%s: %s\\n" "INFO" "Scanning sbosrcarch directory for correct ownerships/permissions" | tee "$LOGSDIR/$LOGFILE" [[ $(printf "%(%H)T") == "04" ]] && {
WRONG="$(find "$DEPOSITORY/" \( \ printf "%s: %s\\n" "INFO" "Scanning sbosrcarch directory for correct ownerships/permissions" | tee "$LOGSDIR/$LOGFILE"
# Drop the caches as sometimes old user/groups are cached.
sudo /opt/sbin/drop-caches
# Scan files.
WRONG="$(find "$DEPOSITORY/" \( \
\( -type b -o -type c -o -type p -o -type s \) -o \ \( -type b -o -type c -o -type p -o -type s \) -o \
\( -type l -a \! -perm 777 \) -o \ \( -type l -a \! -perm 777 \) -o \
\( -type d -a \! -perm 755 -a \! -perm 2755 \) -o \ \( -type d -a \! -perm 755 -a \! -perm 2755 \) -o \
@ -76,32 +82,48 @@ WRONG="$(find "$DEPOSITORY/" \( \
\( \! -user "$SBOSRCARCH_USER" \) -o \ \( \! -user "$SBOSRCARCH_USER" \) -o \
\( \! -group "$DEPOSITORY_GROUP" \) \ \( \! -group "$DEPOSITORY_GROUP" \) \
\) -a -printf "%u:%g\t%M\t%p\n")" \) -a -printf "%u:%g\t%M\t%p\n")"
if [[ -n "$WRONG" ]]; then
# Report findings.
if [[ -n "$WRONG" ]]; then
printf "%s: %s\\n" "ERROR" "This run has been aborted!" | tee -a "$LOGSDIR/$LOGFILE" printf "%s: %s\\n" "ERROR" "This run has been aborted!" | tee -a "$LOGSDIR/$LOGFILE"
printf "%s: %s\\n" "WARNING" "The following paths have erronious ownerships/permissions:" | tee -a "$LOGSDIR/$LOGFILE" printf "%s: %s\\n" "ERROR" "The following paths have erronious ownerships/permissions:" | tee -a "$LOGSDIR/$LOGFILE"
printf "%s\\n" "$WRONG" | sed -re 's/^/ /g' | tee -a "$LOGSDIR/$LOGFILE" printf "%s\\n" "$WRONG" | sed -re 's/^/ /g' | tee -a "$LOGSDIR/$LOGFILE"
ERR=-1 ERR=-1
else else
printf "%s: %s\\n" "INFO" "No ownership/permission issues found" | tee -a "$LOGSDIR/$LOGFILE" printf "%s: %s\\n" "INFO" "No ownership/permission issues found" | tee -a "$LOGSDIR/$LOGFILE"
# Do the sbosrcarch work. fi
}
# Do the sbosrcarch work.
(( ERR == 0 )) && {
umask 022 umask 022
printf "%s: %s: %s\\n" "INFO" "Beginning sbosrcarch run" "sg \"$DEPOSITORY_GROUP\" -c \"$COMMAND ${1:-update}${2:+ $2}${3:+ $3}\"" | tee -a "$LOGSDIR/$LOGFILE"
TMP_OUTPUT="$(sg "$DEPOSITORY_GROUP" -c "$COMMAND ${1:-update}${2:+ $2}${3:+ $3} 2>&1")" printf "%s: %s: %s\\n" "INFO" "Beginning sbosrcarch run" "sg \"$DEPOSITORY_GROUP\" -c \"$COMMAND ${*:-update}\"" | tee -a "$LOGSDIR/$LOGFILE"
TMP_OUTPUT="$(sg "$DEPOSITORY_GROUP" -c "$COMMAND ${*:-update} 2>&1")"
ERR="$?" ERR="$?"
[[ "$*" != *status* ]] && {
sg "$DEPOSITORY_GROUP" -c "$COMMAND status 2>&1" | tee -a "$LOGSDIR/$LOGFILE" sg "$DEPOSITORY_GROUP" -c "$COMMAND status 2>&1" | tee -a "$LOGSDIR/$LOGFILE"
(( ERR += PIPESTATUS[0] ))
}
printf "\\n%s\\n" "$TMP_OUTPUT" | tee -a "$LOGSDIR/$LOGFILE" printf "\\n%s\\n" "$TMP_OUTPUT" | tee -a "$LOGSDIR/$LOGFILE"
(( ERR += $? )) }
fi
# Tell the sysadmin what went on. # Tell the sysadmin what went on.
if (( "$ERR" == 0 )); then if (( "$ERR" == 0 )); then
# Send a report. # Send a report.
notify "report" notify "report" || {
ERR="$?" [[ -x /opt/bin/pushover-client ]] && /opt/bin/pushover-client "mirroring" -p -1 -s "notify() failure" -m "Check logfile: $LOGSDIR/$LOGFILE.xz"
}
else else
# sbosrcarch failed, tell the admin.
notify "failure" || [[ -x /opt/bin/pushover-client ]] && /opt/bin/pushover-client "mirroring" -p -1 -s "SBoSrcArch failure" -m "Check log in email"
ERR="1" ERR="1"
# sbosrcarch failed, tell the admin.
if notify "failure"; then
[[ -x /opt/bin/pushover-client ]] && /opt/bin/pushover-client "mirroring" -p -1 -s "SBoSrcArch failure" -m "Check email / logfile: $LOGSDIR/$LOGFILE.xz"
else
[[ -x /opt/bin/pushover-client ]] && /opt/bin/pushover-client "mirroring" -p -1 -s "notify() failure" -m "Check logfile: $LOGSDIR/$LOGFILE.xz"
fi
fi fi
# Compress the log to save some space. # Compress the log to save some space.