Merge remote-tracking branch 'refs/remotes/origin/master'

host_vars/gw1.pyrocufflink.blue/main.yml

@@ -46,6 +46,8 @@ promtail_scrape_configs:
 
 dnf_automatic_reboot: never
 
+chrony_servers: []
+
 chrony_pools:
 - 1.fedora.pool.ntp.org iburst
 - 2.fedora.pool.ntp.org iburst
@@ -57,3 +59,4 @@ chrony_allow:
 - 172.31.1.0/24
 - 172.24.100.0/24
 - 192.168.1.0/24
+- fd68:c2d2:500e:3e00::/56

host_vars/smtp1.pyrocufflink.blue/main.yml

@@ -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

roles/repohost/files/repohost-createrepo.sh

@@ -1,19 +1,31 @@
 #!/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"
+    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
 }
 
 inotify_loop() {