--- a/bin/update Fri Mar 16 15:22:22 2012 +0200
+++ b/bin/update Fri Mar 16 15:25:31 2012 +0200
@@ -70,7 +70,10 @@
q) LOG= ;;
v) LOG_INFO=y ;;
- D) LOG_DEBUG=y ;;
+ D)
+ LOG_DEBUG=y
+ LOG_INFO=y
+ ;;
C) LOG_CMD=y ;;
p) UPDATE_DIFF=y ;;
F) UPDATE_FORCE=y ;;
@@ -268,7 +271,7 @@
check_update $dst "${dep[@]}" && do_update $dst "${cmd[@]}" || true
}
-## bin wrappers
+## actions
function update_serial {
local serial=$1; shift
@@ -283,21 +286,7 @@
log_debug " $old -> $new"
}
-function expand_zone {
- local output=$1; shift
- local src=$1; shift
-
-}
-
-function process_zone {
- local output=$1; shift
- local src=$1; shift
-
- check_update $output $src && update $output $PROCESS_ZONE $PROCESS_ARGS "$@" $src
-}
-
-## actions
-function copy_zone_part {
+function update_zone_part {
local zone=$1
local part=$2
@@ -423,10 +412,10 @@
update_hosts $ZONES/paivola-reverse.zone.hosts $SETTINGS/paivola.txt --reverse-zone $REVERSE_ZONE --reverse-domain $REVERSE_DOMAIN
log "Copying zone parts..."
- copy_zone_part paivola auto
- copy_zone_part paivola services
- copy_zone_part paivola internal
- copy_zone_part paivola external
+ update_zone_part paivola auto
+ update_zone_part paivola services
+ update_zone_part paivola internal
+ update_zone_part paivola external
log "Updating serials..."