itsync orchestrate.sh with prod - amprolla - devuan's apt repo merger Err parazyd.org 70 hgit clone git://parazyd.org/amprolla.git URL:git://parazyd.org/amprolla.git parazyd.org 70 1Log /git/amprolla/log.gph parazyd.org 70 1Files /git/amprolla/files.gph parazyd.org 70 1Refs /git/amprolla/refs.gph parazyd.org 70 1README /git/amprolla/file/README.md.gph parazyd.org 70 1LICENSE /git/amprolla/file/LICENSE.gph parazyd.org 70 i--- Err parazyd.org 70 1commit c65c85d66eca422c4aea2cdd2bd8d8e8c97981c6 /git/amprolla/commit/c65c85d66eca422c4aea2cdd2bd8d8e8c97981c6.gph parazyd.org 70 1parent 807cb3efadbdc2c7fe3bd0b4a66a4ac2be94eb6e /git/amprolla/commit/807cb3efadbdc2c7fe3bd0b4a66a4ac2be94eb6e.gph parazyd.org 70 hAuthor: parazyd URL:mailto:parazyd@dyne.org parazyd.org 70 iDate: Sat, 9 Dec 2017 16:24:38 +0100 Err parazyd.org 70 i Err parazyd.org 70 isync orchestrate.sh with prod Err parazyd.org 70 i Err parazyd.org 70 iDiffstat: Err parazyd.org 70 i M orchestrate.sh | 50 +++++++++++++++++++------------- Err parazyd.org 70 i Err parazyd.org 70 i1 file changed, 30 insertions(+), 20 deletions(-) Err parazyd.org 70 i--- Err parazyd.org 70 1diff --git a/orchestrate.sh b/orchestrate.sh /git/amprolla/file/orchestrate.sh.gph parazyd.org 70 it@@ -7,30 +7,40 @@ Err parazyd.org 70 i AMPROLLA_UPDATE="${AMPROLLA_UPDATE:-/srv/amprolla/amprolla_update.py}" Err parazyd.org 70 i REPO_ROOT="${REPO_ROOT:-/srv/amprolla}" Err parazyd.org 70 i Err parazyd.org 70 i-# TODO: Remove the while loop and run with cron after testing phase Err parazyd.org 70 i+[ -f "/run/lock/amprolla.lock" ] || { Err parazyd.org 70 i+ln -snf "$REPO_ROOT"/merged-staging "$REPO_ROOT"/merged Err parazyd.org 70 i+# The break call is temporary to catch unhandled exceptions in the testing phase Err parazyd.org 70 i+python3 "$AMPROLLA_UPDATE" || { Err parazyd.org 70 i+ ln -snf "$REPO_ROOT"/merged-production "$REPO_ROOT"/merged Err parazyd.org 70 i+} Err parazyd.org 70 i Err parazyd.org 70 i-while true; do Err parazyd.org 70 i- [ -f "/tmp/amprolla.lock" ] || { Err parazyd.org 70 i- ln -snf "$REPO_ROOT"/merged-staging "$REPO_ROOT"/merged Err parazyd.org 70 i- # The break call is temporary to catch unhandled exceptions in the testing phase Err parazyd.org 70 i- python3 "$AMPROLLA_UPDATE" || { Err parazyd.org 70 i- ln -snf "$REPO_ROOT"/merged-production "$REPO_ROOT"/merged Err parazyd.org 70 i- break Err parazyd.org 70 i- } Err parazyd.org 70 i+printf "rsyncing volatile to production... " Err parazyd.org 70 i+rsync --delete -raX "$REPO_ROOT"/merged-volatile/* "$REPO_ROOT"/merged-production Err parazyd.org 70 i+printf "done!\n" Err parazyd.org 70 i Err parazyd.org 70 i- printf "rsyncing volatile to production... " Err parazyd.org 70 i- rsync --delete -raX "$REPO_ROOT"/merged-volatile/* "$REPO_ROOT"/merged-production Err parazyd.org 70 i- printf "done!\n" Err parazyd.org 70 i+ln -snf "$REPO_ROOT"/merged-production "$REPO_ROOT"/merged Err parazyd.org 70 i Err parazyd.org 70 i- ln -snf "$REPO_ROOT"/merged-production "$REPO_ROOT"/merged Err parazyd.org 70 i+printf "rsyncing volatile to staging... " Err parazyd.org 70 i+rsync --delete -raX "$REPO_ROOT"/merged-volatile/* "$REPO_ROOT"/merged-staging Err parazyd.org 70 i+printf "done!\n" Err parazyd.org 70 i Err parazyd.org 70 i- printf "rsyncing volatile to staging... " Err parazyd.org 70 i- rsync --delete -raX "$REPO_ROOT"/merged-volatile/* "$REPO_ROOT"/merged-staging Err parazyd.org 70 i- printf "done!\n" Err parazyd.org 70 i+printf "rsyncing production to pkgmaster... " Err parazyd.org 70 i+rsync --delete -raX \ Err parazyd.org 70 i+ "$REPO_ROOT"/merged-production/ \ Err parazyd.org 70 i+ mirror@pkgmaster.devuan.org:/home/mirror/devuan/merged Err parazyd.org 70 i+printf "done!\n" Err parazyd.org 70 i Err parazyd.org 70 i- # handle obsolete package logs Err parazyd.org 70 i- cat "$REPO_ROOT"/log/*-oldpackages.txt | sort | uniq > "$REPO_ROOT"/log/oldpackages.txt Err parazyd.org 70 i- } Err parazyd.org 70 i+# handle obsolete package logs Err parazyd.org 70 i+cat "$REPO_ROOT"/log/*-oldpackages.txt | sort | uniq > "$REPO_ROOT"/log/oldpackages.txt Err parazyd.org 70 i Err parazyd.org 70 i- sleep 3600 Err parazyd.org 70 i+_logfiles="libsystemd bannedpackages" Err parazyd.org 70 i+mkdir -p "$REPO_ROOT"/log/t Err parazyd.org 70 i+for i in $_logfiles; do Err parazyd.org 70 i+ sort "$REPO_ROOT"/log/${i}.txt | uniq > "$REPO_ROOT"/log/t/${i}.txt Err parazyd.org 70 i done Err parazyd.org 70 i+cp -f "$REPO_ROOT"/log/t/*.txt "$REPO_ROOT"/log/ Err parazyd.org 70 i+ Err parazyd.org 70 i+rsync "$REPO_ROOT"/log/t/*.txt mirror@pkgmaster.devuan.org:/home/mirror/devuan/ Err parazyd.org 70 i+rsync "$REPO_ROOT"/log/oldpackages.txt "$REPO_ROOT"/log/amprolla.txt \ Err parazyd.org 70 i+ mirror@pkgmaster.devuan.org:/home/mirror/devuan/ Err parazyd.org 70 i+} Err parazyd.org 70 .