Compare commits

...

2 Commits

Author SHA1 Message Date
Dustin 7fc3465d56 smtp1: Fix mynetworks setting for k8s network
The "Kubernetes" subnet is a /27, not a /28.  There are hosts in that
upper section that was masked out, and these were unable to send e-mails
via the relay because they were excluded from the `mynetworks` value.
2025-08-20 07:11:27 -05:00
Dustin 5dbe26fc60 r/repohost: Optimize createrepo queue loop
Instead of waking every 30 seconds, the queue loop in
`repohost-createrepo.sh` now only wakes when it receives an inotify
event indicating the queue file has been modified.  To avoid missing
events that occured while a `createrepo` process was running, there's
now an inner loop that runs until the queue is completely empty, before
returning to blocking on `inotifywait`.
2025-08-20 07:11:27 -05:00
2 changed files with 22 additions and 10 deletions

View File

@ -11,4 +11,4 @@ smtp_mynetworks:
- '[2605:6000:3ccd:da01::]/64'
- 172.30.0.240/28
- 172.31.1.0/24
- 172.30.0.160/28
- 172.30.0.160/27

View File

@ -1,18 +1,30 @@
#!/bin/sh
# vim: set sw=4 ts=4 sts=4 et :
QFILE="${HOME}"/createrepo.queue
REPOS_ROOT="${HOME}"/repos
wait_queue() {
inotifywait \
--event close_write \
--include "${QFILE##*/}" \
"${QFILE%/*}"
}
createrepo_loop() {
while sleep 30; do
[ -f "${QFILE}" ] || continue
mv "${QFILE}" "${QFILE}.work"
sort -u "${QFILE}.work" > "${QFILE}.sorted"
while read dir; do
printf 'Generating repository metadata for %s\n' "${dir}"
createrepo_c "${dir}"
done < "${QFILE}.sorted"
rm -f "${QFILE}.work" "${QFILE}.sorted"
while wait_queue; do
while [ -f "${QFILE}" ]; do
sleep 10
flock "${QFILE}" mv "${QFILE}" "${QFILE}.work"
sort -u "${QFILE}.work" > "${QFILE}.sorted"
while read dir; do
if [ -d "${dir}" ]; then
printf 'Generating repository metadata for %s\n' "${dir}"
createrepo_c "${dir}"
fi
done < "${QFILE}.sorted"
rm -f "${QFILE}.work" "${QFILE}.sorted"
done
done
}