pvl-zones: comparison bin/update

equal deleted inserted replaced

-:1a8bc67b1eb7
+:2b7aad3466c6
 ROOT=$(pwd)
 # resolve $0
 self=$0
 while [ -L $self ]; do
-self=$(dirname $self)/$(readlink $self)
+tgt=$(readlink $self)
+if [ "${tgt:0:1}" == "/" ]; then
+self=$tgt
+else
+self=$(dirname $self)/$tgt
+fi
 done
 # bin dir
 BIN=$(dirname $self)
 PROCESS_ZONE=$BIN/process-zone
 # data files
 DATA=settings
 ZONES=zones
 SERIALS=$DATA
+REPO=$DATA
 # data args
 PROCESS_ARGS='--input-charset latin-1'
 FORWARD_MX=mail
 REVERSE_ZONE=194.197.235
 REVERSE_DOMAIN=paivola.fi
 # external progs
 NAMED_CHECKZONE=/usr/sbin/named-checkzone
-HG=hg
+HG=/usr/bin/hg
 RNDC=/usr/sbin/rndc
 ## options
 IS_TTY=
+LOG_WARN=y
 LOG=y
 LOG_INFO=
 LOG_DEBUG=
 LOG_CMD=
 exit 0
 ;;
 d)  ROOT="$OPTARG" ;;
-q)  LOG= ;;
+q)
+LOG=
+LOG_WARN=
+;;
 v)  LOG_INFO=y ;;
 D)
 LOG_DEBUG=y
 LOG_INFO=y
 ;;
 function log_error {
 log_color 31 "$*"
 }
+function log_warn {
+[ $LOG_WARN ] && log_color 33 "$*" || true
+}
 function log {
 [ $LOG ] && log_msg "$*" || true
 }
 function log_info {
 local indent=$1; shift
 log_cmd "$@"
 "$@" | sed "s/^/$indent/"
+return ${PIPESTATUS[0]}
 }
 function abspath () {
 echo "$ROOT/$1"
 }
 ## hg
 function hg {
-local repo=$r
+local repo=$1; shift
-$HG -R $ROOT/$repo "$@"
+cmd $HG -R $ROOT/$repo "$@"
 }
 function hg_modified {
 local repo=$1
 local repo=$1
 local msg=$2
 local user_opt=$(hg_user)
 log_debug "commit: $user_opt: $msg"
-cmd hg $repo commit $user_opt -m "$msg"
+hg $repo commit $user_opt -m "$msg"
 }
 ## functions
 function check_update {
 local zone=$1
 local view=$2
 local base=$3
 local lnk=$ZONES/$view/$zone.zone
-local tgt=$ZONES/$view/$base.zone
+local tgt
+if [ $zone == $base ]; then
+# out of view
+log_debug "$view/$zone: base $base from root"
+tgt=$ZONES/$base.zone
+else
+log_debug "$view/$zone: base $base from view"
+tgt=$ZONES/$view/$base.zone
+fi
 if [ -e $ROOT/$lnk ] && [ $(readlink $ROOT/$lnk) == $ROOT/$tgt ]; then
 log_info "Linking $lnk -> $tgt: not changed"
 else
 log_info "Linking $lnk -> $tgt..."
 fi
 }
 # deploy new zone data to bind
 function deploy_zones {
-cmd $RNDC reload
+indent "        rndc: " $RNDC reload
 }
 # commit data changes
 function commit_data {
-local repo=$DATA
+local repo=$1
 if hg_modified $repo; then
 log_info "Commit changes in $repo:"
 indent "    " hg_diff $repo
 hg_commit $repo "$COMMIT_MSG"
 else
 log_info "Commit changes in $repo: no changes"
+fi
+}
+function ensure_dir {
+local dir=$1
+if [ ! -d $ROOT/$dir ]; then
+log_warn "Creating output dir: $dir"
+cmd mkdir $ROOT/$dir
 fi
 }
 function main {
 # test tty
 [ -t 1 ] && IS_TTY=y
+local views=(internal external)
 parse_args "$@"
 ## test env
 [ -d $ROOT/$DATA ] || die "Missing data: $ROOT/$DATA"
-[ -d $ROOT/$SERIALS ] || die "Missing serials: $ROOT/$SERIALS"
+ensure_dir  $ZONES
-[ -d $ROOT/$ZONES ] || die "Missing zones: $ROOT/$ZONES"
+# views
+for view in "${views[@]}"; do
+ensure_dir $ZONES/$view
+done
 ## hosts
 # test
 log "Testing hosts..."
 check_hosts     $DATA/paivola.txt --check-exempt ufc
 check_zone          paivola.fi                  $ZONES/external/paivola.zone
 check_zone          paivola.fi                  $ZONES/internal/paivola.zone
 check_zone          235.197.194.in-addr.arpa    $ZONES/paivola-reverse.zone
 # extra zones...
-local views=(internal external)
 local base_zone=paivola
 local link_zones=(paivola.fi paivola.net paivola.org paivola.info paivola.mobi xn--pivl-load8j.fi)
 log "Linking extra zones..."
 for view in "${views[@]}"; do
 for zone in "${link_zones[@]}"; do
 link_zone_view  $zone   $view   $base_zone
 check_zone      $zone   $ZONES/$view/$zone.zone
 done
+# reverse
+link_zone_view      paivola-reverse     $view   paivola-reverse
 done
 ## deploy
 if [ $DEPLOY_SKIP ]; then
 log "Deploy zones: skipped"
 if [ $COMMIT_SKIP ] && [ ! $COMMIT_FORCE ]; then
 log "Commit data: skipped"
 else
 log "Commit data..."
-commit_data
+commit_data $REPO
 fi
 }
 main "$@"

changeset 31	2b7aad3466c6
parent 30	1a8bc67b1eb7
child 32	694dab02a6b0