rename static-mirror-run's basedir to componentdir, as that's what it is now

[dsa-puppet.git] / modules / roles / files / static-mirroring / static-mirror-run

diff --git a/modules/roles/files/static-mirroring/static-mirror-run b/modules/roles/files/static-mirroring/static-mirror-run
index 038700ddb73a4497e61b7ab834a9011823f8783f..119d1055cb6b61fce21ac97dd0fdf44075065475 100755 (executable)
--- a/modules/roles/files/static-mirroring/static-mirror-run
+++ b/modules/roles/files/static-mirroring/static-mirror-run
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# initiate a mirror staged mirror update from sync-source.
+# initiate a staged mirror update from sync-source for a component.
 #
 # if we have a serial file and we got a serial on the command line, only sync if the serial is different
 
@@ -32,7 +32,7 @@ set -u
 NAME="$(basename "$0")"
 
 usage() {
-       echo "Usage: $0 [--one-stage] <basedir> <sync-source> [<serial>]"
+       echo "Usage: $0 [--one-stage] <componentdir> <sync-source> [<serial>]"
 }
 
 if [ "${1:-}" = "-h" ] || [ "${1:-}" = "--help" ]; then usage; exit 0; fi
@@ -57,10 +57,10 @@ while :; do
        esac
 done
 
-BASEDIR=${1:-}; shift
+COMPONENTDIR=${1:-}; shift
 SYNC_SOURCE=${1:-}; shift
 SYNC_SERIAL=${1:-}; shift || true
-if [ -z "$BASEDIR" ]; then usage >&2; exit 1; fi
+if [ -z "$COMPONENTDIR" ]; then usage >&2; exit 1; fi
 if [ -z "$SYNC_SOURCE" ]; then usage >&2; exit 1; fi
 
 RSYNC="rsync"
@@ -79,7 +79,7 @@ CNF_FILE="$HOME/etc/$NAME.conf"
 ! [ -e "$CNF_FILE" ] || . "$CNF_FILE"
 
 SOURCE="${SYNC_SOURCE}/"
-BASEDIR="${BASEDIR}/"
+COMPONENTDIR="${COMPONENTDIR}/"
 
 ###############################################
 
@@ -106,7 +106,8 @@ log() {
 }
 
 lock() {
-       exec 200< "$BASEDIR"
+       mkdir -p "$COMPONENTDIR"
+       exec 200< "$COMPONENTDIR"
        if ! flock -e 200; then
                log "Cannot acquire lock."
                echo >&5 "[MSM] LOCK-ERROR"
@@ -119,13 +120,15 @@ lock() {
 
 
 log_setup
-#log "called with $* and ${SSH_ORIGINAL_COMMAND:-no ssh original command options}."
 log "called with $*"
 lock
 
-if [ -e "${BASEDIR}${ACTIVE}" ] && [ "$(readlink "${BASEDIR}${ACTIVE}")" = "$ALPHA" ] ; then
+if [ -e "${COMPONENTDIR}${ACTIVE}" ] && [ "$(readlink "${COMPONENTDIR}${ACTIVE}")" = "$ALPHA" ] ; then
        staging="$BRAVO"
        active="$ALPHA"
+elif [ -e "${COMPONENTDIR}${ACTIVE}" ] && [ "$(readlink "${COMPONENTDIR}${ACTIVE}")" != "$BRAVO" ] ; then
+       echo >&5 "Invalid state of ${COMPONENTDIR}${ACTIVE}."
+       exit 1
 else
        staging="$ALPHA"
        active="$BRAVO"
@@ -133,8 +136,8 @@ fi
 log "active is $active; staging is $staging"
 
 rsync_source="${SOURCE}"
-rsync_curactive="${BASEDIR}${active}/"
-rsync_target="${BASEDIR}${staging}/"
+rsync_curactive="${COMPONENTDIR}${active}/"
+rsync_target="${COMPONENTDIR}${staging}/"
 
 if [ -e "$rsync_curactive/.serial" ] && [ -n "$SYNC_SERIAL" ] && [ "$(cat $rsync_curactive/.serial)" = "$SYNC_SERIAL" ]; then
        log "active is already at serial $SYNC_SERIAL.  No action required."
@@ -155,7 +158,7 @@ fi
 
 case "$action" in
        go)
-               ln --symbolic --force --no-target-directory "$staging" "${BASEDIR}$ACTIVE"
+               ln --symbolic --force --no-target-directory "$staging" "${COMPONENTDIR}$ACTIVE"
                rm -rf "$rsync_curactive"
                echo >&5 "[MSM] STAGE2-DONE"
                log "stage2 done"