lib/update.operations
author Tero Marttila <terom@paivola.fi>
Wed, 21 Mar 2012 18:59:43 +0200
changeset 66 482d06935d96
parent 64 620f4594a09d
child 68 5a0335960591
permissions -rw-r--r--
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
60
b65ce9123039 lib/update: add shebangs to make sloccount work
Tero Marttila <terom@paivola.fi>
parents: 59
diff changeset
     1
#!/bin/bash
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
     2
## vim: set ft=sh :
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
     3
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
     4
# Operations on zonefiles/hosts/whatever
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
     5
62
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
     6
function link_generic {
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
     7
    local out=$1
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
     8
    local tgt=$2
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
     9
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
    10
    if check_link $out $tgt; then
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
    11
        log_update "Linking $out -> $tgt..."
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
    12
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
    13
        do_link $out $tgt
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
    14
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
    15
    else
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
    16
        log_skip "Linking $out -> $tgt: not changed"
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
    17
    fi
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
    18
}
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
    19
64
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
    20
function copy_generic {
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
    21
    local out=$1
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
    22
    local src=$2
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
    23
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
    24
    if check_update $out $src; then
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
    25
        log_update "Copying $out <- $src..."
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
    26
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
    27
        do_update $out \
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
    28
            cat $ROOT/$src
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
    29
    else
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
    30
        log_skip "Copying $out <- $src: not changed"
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
    31
    fi
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
    32
}
62
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
    33
66
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
    34
## Run check-command on given file, outputting results:
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
    35
#
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
    36
#   check_generic   $src    $cmd $args...
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
    37
#
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
    38
function check_generic {
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
    39
    local src=$1; shift
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
    40
    local cmd=$1; shift
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
    41
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
    42
    if cmd_test $cmd -q "$@"; then
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
    43
        log_skip    "Check $src: OK"
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
    44
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
    45
    else
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
    46
        log_error   "  Check $src: Failed"
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
    47
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
    48
        indent "    " $cmd "$@"
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
    49
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
    50
        exit 1
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
    51
    fi
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
    52
}
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
    53
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    54
## Hosts
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    55
## Update hosts from verbatim from input zone data:
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    56
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    57
#   copy_hosts      $ZONES/$zone    $DATA/$base
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    58
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    59
# Writes updated zone to $zone, deps on $base.
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    60
function copy_hosts {
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    61
    local zone=$1
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    62
    local base=$2
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    63
64
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
    64
    # XXX: filenames given directly
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
    65
    local out=$zone
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
    66
    local src=$base
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    67
64
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
    68
    copy_generic $out $src
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    69
}
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    70
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    71
## Generate hosts from input zone data using $BIN/process-zone:
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    72
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    73
#   update_hosts    $ZONES/$zone    $DATA/$base
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    74
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    75
# Writes process-zone'd data to $zone, deps on $base.
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    76
function update_hosts {
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    77
    local zone=$1; shift
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    78
    local base=$1; shift
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    79
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    80
    if check_update $zone $base; then
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    81
        log_update "Generating hosts $zone <- $base..."
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    82
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    83
        do_update $zone \
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    84
            $BIN/process-zone $PROCESS_ARGS $ROOT/$base "$@"
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    85
    else
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    86
        log_skip "Generating hosts $zone <- $base: not changed"
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    87
    fi
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    88
}
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    89
61
22b58b938fd0 update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents: 60
diff changeset
    90
## Update .serial number:
22b58b938fd0 update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents: 60
diff changeset
    91
#
22b58b938fd0 update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents: 60
diff changeset
    92
#   do_update_serial $serial
22b58b938fd0 update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents: 60
diff changeset
    93
#
22b58b938fd0 update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents: 60
diff changeset
    94
# Shows old/new serial on debug.
22b58b938fd0 update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents: 60
diff changeset
    95
function do_update_serial {
22b58b938fd0 update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents: 60
diff changeset
    96
    local serial=$1
22b58b938fd0 update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents: 60
diff changeset
    97
22b58b938fd0 update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents: 60
diff changeset
    98
    # read
22b58b938fd0 update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents: 60
diff changeset
    99
    local old=$(test -e $ROOT/$serial && cat $ROOT/$serial || echo '')
22b58b938fd0 update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents: 60
diff changeset
   100
22b58b938fd0 update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents: 60
diff changeset
   101
22b58b938fd0 update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents: 60
diff changeset
   102
    cmd $BIN/update-serial $ROOT/$serial
22b58b938fd0 update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents: 60
diff changeset
   103
    
22b58b938fd0 update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents: 60
diff changeset
   104
    # read
22b58b938fd0 update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents: 60
diff changeset
   105
    local new=$(cat $ROOT/$serial)
22b58b938fd0 update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents: 60
diff changeset
   106
        
22b58b938fd0 update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents: 60
diff changeset
   107
    debug "  $old -> $new"
22b58b938fd0 update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents: 60
diff changeset
   108
}
22b58b938fd0 update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents: 60
diff changeset
   109
22b58b938fd0 update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents: 60
diff changeset
   110
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   111
## Generate new serial for zone using $BIN/update-serial, if the zone data has changed:
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   112
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   113
#   update_serial   $zone   $deps...
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   114
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   115
# Supports SERIAL_FORCE/NOOP.
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   116
# Updates $SERIALS/$zone.serial.
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   117
function update_serial {
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   118
    local zone=$1; shift
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   119
    
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   120
    local serial=$SERIALS/$zone.serial
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   121
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   122
    # test
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   123
    if [ $SERIAL_FORCE ]; then
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   124
        log_force "Updating $serial: forced"
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   125
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   126
        do_update_serial $serial
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   127
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   128
    elif ! check_update $serial "$@"; then
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   129
        log_skip "Updating $serial: not changed"
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   130
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   131
    elif [ $SERIAL_NOOP ]; then
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   132
        log_noop "Updating $serial: skipped"
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   133
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   134
    else
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   135
        log_update "Updating $serial..."
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   136
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   137
        do_update_serial $serial
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   138
    fi
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   139
}
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   140
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   141
## Link serial for zone from given base-zone:
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   142
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   143
#   link_serial $zone $base
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   144
function link_serial {
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   145
    local zone=$1
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   146
    local base=$2
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   147
62
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   148
    local out=$SERIALS/$zone.serial
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   149
    local tgt=$SERIALS/$base.serial
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   150
62
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   151
    link_generic $out $tgt
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   152
}
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   153
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   154
## Update zone file verbatim from source:
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   155
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   156
#   copy_zone   $view   $zone   [$base]
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   157
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   158
# Copies changed $DATA/$base zone data to $ZONES/$view/$zone.
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   159
function copy_zone {
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   160
    local view=$1
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   161
    local zone=$2
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   162
    local base=${3:-$zone}
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   163
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   164
    local out=$ZONES/$view/$zone
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   165
    local src=$DATA/$base
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   166
64
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
   167
    copy_generic $out $src
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   168
}
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   169
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   170
## Expand zone file from source using $BIN/expand-zone:
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   171
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   172
#   update_zone $view   $zone   [$base]
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   173
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   174
# Processed $DATA/$base zone data through $BIN/expand-zone, writing output to $ZONES/$view/$zone.
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   175
function update_zone {
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   176
    local view=$1
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   177
    local zone=$2
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   178
    local base=${3:-$zone}
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   179
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   180
    local out=$ZONES/$view/$zone
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   181
    local src=$DATA/$base.zone
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   182
    local lnk=$ZONES/$base
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   183
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   184
    local serial=$SERIALS/$base.serial
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   185
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   186
    if check_update $out $src $serial; then
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   187
        log_update "Generating $out <- $src..." 
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   188
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   189
        do_update $out \
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   190
            $BIN/expand-zone $ROOT/$src \
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   191
                --serial $ROOT/$serial              \
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   192
                --expand zones=$(abspath $ZONES)    \
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   193
                --expand view=$view
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   194
    else
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   195
        log_skip "Generating $out <- $src: not changed" 
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   196
    fi
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   197
}
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   198
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   199
## Link zone file to ues given shared zone.
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   200
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   201
#   link_zone   $view   $zone   [$base]
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   202
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   203
# Looks for shared zone at:
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   204
#   $ZONES/$view/$base
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   205
#   $ZONES/common/$base
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   206
function link_zone {
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   207
    local view=$1
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   208
    local zone=$2
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   209
    local base=${3:-$zone}
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   210
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   211
    local out=$ZONES/$view/$zone
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   212
    local tgt=$(choose_link $out $ZONES/$view/$base $ZONES/common/$base)
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   213
62
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   214
    link_generic $out $tgt
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   215
}
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   216
63
a88766722d18 update: rename dhcp hosts -> dhcp conf, makes more sense; check input files before linking
Tero Marttila <terom@paivola.fi>
parents: 62
diff changeset
   217
## Link dhcp file directly from data to $DHCP
a88766722d18 update: rename dhcp hosts -> dhcp conf, makes more sense; check input files before linking
Tero Marttila <terom@paivola.fi>
parents: 62
diff changeset
   218
function link_dhcp_conf {
a88766722d18 update: rename dhcp hosts -> dhcp conf, makes more sense; check input files before linking
Tero Marttila <terom@paivola.fi>
parents: 62
diff changeset
   219
    local conf=$1
a88766722d18 update: rename dhcp hosts -> dhcp conf, makes more sense; check input files before linking
Tero Marttila <terom@paivola.fi>
parents: 62
diff changeset
   220
    local base=${2:-$conf}
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   221
63
a88766722d18 update: rename dhcp hosts -> dhcp conf, makes more sense; check input files before linking
Tero Marttila <terom@paivola.fi>
parents: 62
diff changeset
   222
    local out=$DHCP/$conf.conf
62
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   223
    local tgt=$(choose_link $out $DHCP/$base.conf $DHCP_DATA/$base.conf)
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   224
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   225
    link_generic $out $tgt
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   226
}
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   227
64
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
   228
## Copy dhcp conf from data to $DHCP
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
   229
function copy_dhcp_conf {
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
   230
    local conf=$1
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
   231
    local base=${2:-$conf}
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
   232
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
   233
    local out=$DHCP/$conf.conf
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
   234
    local src=$DHCP_DATA/$base.conf
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
   235
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
   236
    copy_generic $out $src
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
   237
}
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
   238
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   239
## Test hosts zone for validity:
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   240
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   241
#   check_hosts     $DATA/$hosts    --check-exempt ...
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   242
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   243
# Fails if the check fails.
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   244
function check_hosts {
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   245
    local hosts=$1; shift 1
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   246
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   247
    local cmd=($BIN/process-zone $PROCESS_ARGS $ROOT/$hosts --check-hosts "$@")
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   248
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   249
    if "${cmd[@]}" -q; then
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   250
        log_skip "Check $hosts: OK"
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   251
    else
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   252
        log_error "  Check $hosts: Failed"
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   253
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   254
        indent "    " "${cmd[@]}"
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   255
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   256
        exit 1
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   257
    fi
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   258
}
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   259
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   260
## Test zone file for validity using named-checkzone:
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   261
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   262
#   check_zone      $view       $zone       $origin
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   263
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   264
# Uses the zonefile at $ZONES/$view/$zone, loading it with given initial $ORIGIN.
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   265
# Fails if the check fails.
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   266
function check_zone {
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   267
    local view=$1
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   268
    local zone=$2
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   269
    local origin=$3
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   270
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   271
    local src=$ZONES/$view/$zone
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   272
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   273
    local cmd=($NAMED_CHECKZONE $origin $ROOT/$src)
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   274
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   275
    # test
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   276
    # XXX: checkzone is very specific about the order of arguments, -q must be first
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   277
    if $NAMED_CHECKZONE -q $origin $ROOT/$src; then
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   278
        log_skip "Check $src ($origin): OK"
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   279
    else
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   280
        log_error "  Check $src ($origin): Failed:"
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   281
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   282
        indent "    " "${cmd[@]}"
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   283
        
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   284
        exit 1
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   285
    fi
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   286
}
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   287
62
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   288
## Test DHCP configuration for validity using dhcpd -t:
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   289
#
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   290
#   check_dhcp      [$conf]
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   291
#
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   292
# Defaults to the global $DHCPD_CONF.
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   293
# Fails if the check fails.
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   294
function check_dhcp {
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   295
    local conf=${1:-$DHCPD_CONF}
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   296
66
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   297
    check_generic $conf \
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   298
        $DHCPD -cf $conf -t
62
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   299
}
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   300
63
a88766722d18 update: rename dhcp hosts -> dhcp conf, makes more sense; check input files before linking
Tero Marttila <terom@paivola.fi>
parents: 62
diff changeset
   301
## Test DHCP configuration of given settings/dhcp using check_dhcp $DHCP_DATA/$host.conf:
62
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   302
#
63
a88766722d18 update: rename dhcp hosts -> dhcp conf, makes more sense; check input files before linking
Tero Marttila <terom@paivola.fi>
parents: 62
diff changeset
   303
#   check_dhcp_conf     $conf
a88766722d18 update: rename dhcp hosts -> dhcp conf, makes more sense; check input files before linking
Tero Marttila <terom@paivola.fi>
parents: 62
diff changeset
   304
#
a88766722d18 update: rename dhcp hosts -> dhcp conf, makes more sense; check input files before linking
Tero Marttila <terom@paivola.fi>
parents: 62
diff changeset
   305
function check_dhcp_conf {
66
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   306
    local conf=$1;
62
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   307
63
a88766722d18 update: rename dhcp hosts -> dhcp conf, makes more sense; check input files before linking
Tero Marttila <terom@paivola.fi>
parents: 62
diff changeset
   308
    check_dhcp $DHCP_DATA/$conf.conf
62
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   309
}
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   310
66
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   311
## Test DHCP hosts source configuration for invalid fixed-address stanzas:
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   312
#
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   313
#   check_dhcp_hosts    $hosts_conf
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   314
#
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   315
function check_dhcp_hosts {
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   316
    local hosts=$1
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   317
   
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   318
    # XXX: still too unclear
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   319
    local src=$hosts #$DHCP_DATA/$hosts.conf
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   320
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   321
    # set in do_reload_zones below
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   322
    if [ $RELOAD_ZONES ]; then
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   323
        check_generic $src \
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   324
            $BIN/check-dhcp-hosts $DHCP_FILE_ARGS $ROOT/$src
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   325
    else
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   326
        log_noop "Check $src: skipped; did not reload DNS zones"
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   327
    fi
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   328
}
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   329
59
b0c761c4d5f8 update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents: 57
diff changeset
   330
# Run rndc reload
66
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   331
function do_reload_zones {
59
b0c761c4d5f8 update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents: 57
diff changeset
   332
    # run
b0c761c4d5f8 update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents: 57
diff changeset
   333
    indent "        rndc: " \
b0c761c4d5f8 update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents: 57
diff changeset
   334
        $RNDC reload
66
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   335
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   336
    # set flag
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   337
    RELOAD_ZONES=y
59
b0c761c4d5f8 update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents: 57
diff changeset
   338
}
b0c761c4d5f8 update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents: 57
diff changeset
   339
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   340
## Load update zonefiles into bind:
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   341
#
61
22b58b938fd0 update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents: 60
diff changeset
   342
#   reload_zones    
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   343
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   344
# Invokes `rndc reload`, showing its output.
61
22b58b938fd0 update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents: 60
diff changeset
   345
function reload_zones {
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   346
    local msg="Reload zones"
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   347
61
22b58b938fd0 update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents: 60
diff changeset
   348
    if [ $RELOAD_FORCE ]; then
59
b0c761c4d5f8 update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents: 57
diff changeset
   349
        log_force  "$msg..."
b0c761c4d5f8 update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents: 57
diff changeset
   350
        
66
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   351
        do_reload_zones
59
b0c761c4d5f8 update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents: 57
diff changeset
   352
61
22b58b938fd0 update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents: 60
diff changeset
   353
    elif [ $RELOAD_NOOP ]; then
59
b0c761c4d5f8 update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents: 57
diff changeset
   354
        log_noop    "$msg: skipped"
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   355
    
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   356
    elif [ ! -r $RNDC_KEY ]; then
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   357
        log_error   "  $msg: rndc: permission denied: $RNDC_KEY"
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   358
59
b0c761c4d5f8 update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents: 57
diff changeset
   359
        return 1
b0c761c4d5f8 update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents: 57
diff changeset
   360
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   361
    else
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   362
        log_update  "$msg..."
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   363
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   364
        # run
66
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   365
        do_reload_zones
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   366
    fi
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   367
}
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   368
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   369
## Reload DHCP by restarting it, if running:
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   370
#
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   371
#   do_reload_dhcp
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   372
#
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   373
# Does NOT restart dhcp if it is not running (status).
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   374
function do_reload_dhcp {
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   375
    if cmd_test $DHCPD_INIT status >/dev/null; then
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   376
        cmd $DHCPD_INIT restart
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   377
    else
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   378
        log_warn "dhcpd not running; did not restart"
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   379
    fi
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   380
}
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   381
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   382
## Reload dhcp hosts
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   383
#
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   384
#   reload_dhcp
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   385
#
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   386
# noop's if we haven't reloaded zones
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   387
function reload_dhcp {
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   388
    local msg="Reload DHCP hosts"
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   389
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   390
    if [ $RELOAD_FORCE ]; then
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   391
        log_force  "$msg..."
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   392
        
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   393
        do_reload_dhcp
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   394
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   395
    elif [ $RELOAD_NOOP ]; then
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   396
        log_noop    "$msg: skipped"
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   397
    
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   398
    else
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   399
        log_update  "$msg..."
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   400
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   401
        # run
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   402
        do_reload_dhcp
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   403
    fi
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   404
}
61
22b58b938fd0 update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents: 60
diff changeset
   405
22b58b938fd0 update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents: 60
diff changeset
   406
## Perform `hg commit` for $DATA
22b58b938fd0 update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents: 60
diff changeset
   407
function do_commit {
22b58b938fd0 update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents: 60
diff changeset
   408
    local msg=$1
22b58b938fd0 update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents: 60
diff changeset
   409
22b58b938fd0 update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents: 60
diff changeset
   410
    [ $LOG_DIFF ] && indent "    " hg_diff
22b58b938fd0 update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents: 60
diff changeset
   411
22b58b938fd0 update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents: 60
diff changeset
   412
    hg_commit "$msg"
22b58b938fd0 update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents: 60
diff changeset
   413
}
22b58b938fd0 update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents: 60
diff changeset
   414
22b58b938fd0 update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents: 60
diff changeset
   415
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   416
## Commit changes in $DATA to version control:
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   417
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   418
#   commit_data
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   419
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   420
# Invokes `hg commit` in the $REPO, first showing the diff.
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   421
function commit_data {
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   422
    local repo=$REPO
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   423
    local commit_msg="$COMMIT_MSG"
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   424
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   425
    local msg="Commit changes in $repo"
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   426
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   427
    # operate?
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   428
    if [ $COMMIT_FORCE ]; then
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   429
        log_force   "$msg..."
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   430
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   431
        do_commit "$commit_msg"
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   432
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   433
    elif ! hg_modified; then
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   434
        log_skip    "$msg: no changes"
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   435
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   436
    elif [ $COMMIT_SKIP ]; then
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   437
        log_noop    "$msg: skipped"
57
d83a5e9be193 update: use hg diff --stat for .serials
Tero Marttila <terom@paivola.fi>
parents: 52
diff changeset
   438
        
d83a5e9be193 update: use hg diff --stat for .serials
Tero Marttila <terom@paivola.fi>
parents: 52
diff changeset
   439
        # still show diff, though
d83a5e9be193 update: use hg diff --stat for .serials
Tero Marttila <terom@paivola.fi>
parents: 52
diff changeset
   440
        [ $LOG_DIFF ] && indent "    " hg_diff
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   441
    else
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   442
        log_update  "$msg..."
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   443
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   444
        do_commit "$commit_msg"
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   445
    fi
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   446
}
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   447