lib/update.operations
author Tero Marttila <terom@paivola.fi>
Tue, 17 Dec 2013 00:04:00 +0200
branchdns-new
changeset 82 26a307558602
parent 74 c21ecf55a736
child 84 77df429f63a3
permissions -rw-r--r--
update update
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
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
     6
function link {
62
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
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    20
function copy {
64
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 \
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    28
            cat $src
64
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
#
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    36
#   check    $src    $cmd $args...
66
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
    37
#
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    38
function check {
66
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
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    68
    copy $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
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    71
## Generate forward zone from hosts hosts using pvl.hosts-dns:
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    72
#
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    73
#   update_hosts out/hosts/$hosts in/hosts/$hosts
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    74
function update_hosts_forward {
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    75
    local out=$1
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    76
    local src=$2
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    77
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    78
    if check_update $out $src; then
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    79
        log_update "Generating hosts zone $out <- $src..."
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    80
    
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    81
        do_update $out $OPT/bin/pvl.hosts-dns $src \
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    82
            --hosts-charset=$CHARSET
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    83
    
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    84
    else
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    85
        log_skip "Generating hosts $out <- $src: not changed"
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    86
    fi
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    87
}
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    88
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    89
function update_hosts_dhcp {
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    90
    local out=$1
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    91
    local src=$2
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    92
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    93
    if check_update $out $src; then
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    94
        log_update "Generating DHCP hosts $out <- $src..."
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    95
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    96
        do_update $out $OPT/bin/pvl.hosts-dhcp $src \
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    97
            --hosts-charset=$CHARSET
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    98
    else
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    99
        log_skip "Generating DHCP hosts $out <- $src: not changed"
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   100
    fi
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   101
}
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   102
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
   103
## 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
   104
#
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
#   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
   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
# 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
   108
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
   109
    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
   110
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
   111
    # read
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   112
    local old=$(test -e $serial && cat $serial || echo '')
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
   113
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   114
    cmd $OPT/bin/pvl.dns-serial $serial
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
   115
    
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
   116
    # read
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   117
    local new=$(cat $serial)
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
   118
        
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
   119
    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
   120
}
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
   121
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
   122
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   123
## Generate new serial for zone using pvl.dns-serial, if the zone data has changed:
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   124
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   125
#   update_serial   $zone   $deps...
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   126
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   127
# Supports SERIAL_FORCE/NOOP.
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   128
# Updates $SERIALS/$zone.serial.
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   129
function update_serial {
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   130
    local serial=$1; shift
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   131
    
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   132
    # test
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   133
    if [ $SERIAL_FORCE ]; then
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   134
        log_force "Updating $serial: forced"
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   135
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   136
        do_update_serial $serial
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   137
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   138
    elif ! check_update $serial "$@"; then
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   139
        log_skip "Updating $serial: not changed"
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
    elif [ $SERIAL_NOOP ]; then
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   142
        log_noop "Updating $serial: skipped"
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   143
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   144
    else
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   145
        log_update "Updating $serial..."
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   146
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   147
        do_update_serial $serial
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   148
    fi
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   149
}
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   150
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   151
## 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
   152
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   153
#   link_serial $zone $base
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   154
function link_serial {
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   155
    local zone=$1
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   156
    local base=$2
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   157
62
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   158
    local out=$SERIALS/$zone.serial
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   159
    local tgt=$SERIALS/$base.serial
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   160
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   161
    link $out $tgt
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   162
}
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
## Update zone file verbatim from source:
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   165
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   166
#   copy_zone   $view   $zone   [$base]
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   167
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   168
# 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
   169
function copy_zone {
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   170
    local view=$1
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   171
    local zone=$2
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   172
    local base=${3:-$zone}
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
    local out=$ZONES/$view/$zone
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   175
    local src=$DATA/$base
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   176
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   177
    copy $out $src
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   178
}
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   179
72
a8160670c3cb lib/update.operations: implement choose_zone to choose correct base for zone from settings/*.zone
Tero Marttila <terom@paivola.fi>
parents: 71
diff changeset
   180
## Return the first zone that exists under $DATA/$name.zone
a8160670c3cb lib/update.operations: implement choose_zone to choose correct base for zone from settings/*.zone
Tero Marttila <terom@paivola.fi>
parents: 71
diff changeset
   181
#
a8160670c3cb lib/update.operations: implement choose_zone to choose correct base for zone from settings/*.zone
Tero Marttila <terom@paivola.fi>
parents: 71
diff changeset
   182
#   base=$(choose_zone $name...)
a8160670c3cb lib/update.operations: implement choose_zone to choose correct base for zone from settings/*.zone
Tero Marttila <terom@paivola.fi>
parents: 71
diff changeset
   183
function choose_zone {
a8160670c3cb lib/update.operations: implement choose_zone to choose correct base for zone from settings/*.zone
Tero Marttila <terom@paivola.fi>
parents: 71
diff changeset
   184
    # look
a8160670c3cb lib/update.operations: implement choose_zone to choose correct base for zone from settings/*.zone
Tero Marttila <terom@paivola.fi>
parents: 71
diff changeset
   185
    for name in "$@"; do
a8160670c3cb lib/update.operations: implement choose_zone to choose correct base for zone from settings/*.zone
Tero Marttila <terom@paivola.fi>
parents: 71
diff changeset
   186
        if [ $name ] && [ -e $DATA/$name.zone ]; then
a8160670c3cb lib/update.operations: implement choose_zone to choose correct base for zone from settings/*.zone
Tero Marttila <terom@paivola.fi>
parents: 71
diff changeset
   187
            echo $name
a8160670c3cb lib/update.operations: implement choose_zone to choose correct base for zone from settings/*.zone
Tero Marttila <terom@paivola.fi>
parents: 71
diff changeset
   188
            return 0
a8160670c3cb lib/update.operations: implement choose_zone to choose correct base for zone from settings/*.zone
Tero Marttila <terom@paivola.fi>
parents: 71
diff changeset
   189
        fi
a8160670c3cb lib/update.operations: implement choose_zone to choose correct base for zone from settings/*.zone
Tero Marttila <terom@paivola.fi>
parents: 71
diff changeset
   190
    done
a8160670c3cb lib/update.operations: implement choose_zone to choose correct base for zone from settings/*.zone
Tero Marttila <terom@paivola.fi>
parents: 71
diff changeset
   191
    
a8160670c3cb lib/update.operations: implement choose_zone to choose correct base for zone from settings/*.zone
Tero Marttila <terom@paivola.fi>
parents: 71
diff changeset
   192
    # failed to find
a8160670c3cb lib/update.operations: implement choose_zone to choose correct base for zone from settings/*.zone
Tero Marttila <terom@paivola.fi>
parents: 71
diff changeset
   193
    die "Unable to find zone in $DATA/*.zone: $@"
a8160670c3cb lib/update.operations: implement choose_zone to choose correct base for zone from settings/*.zone
Tero Marttila <terom@paivola.fi>
parents: 71
diff changeset
   194
}
a8160670c3cb lib/update.operations: implement choose_zone to choose correct base for zone from settings/*.zone
Tero Marttila <terom@paivola.fi>
parents: 71
diff changeset
   195
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   196
## Expand zone file from source using pvl.dns-zone:
52
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
#   update_zone $view   $zone   [$base]
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   199
function update_zone {
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   200
    local out=$1
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   201
    local src=$2
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   202
    local serial=$3
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   203
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   204
    if check_update $out $src $serial; then
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   205
        log_update "Generating $out <- $src..." 
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   206
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   207
        do_update $out $OPT/bin/pvl.dns-zone $src \
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   208
                --serial $(cat $serial)
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   209
    else
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   210
        log_skip "Generating $out <- $src: not changed" 
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   211
    fi
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   212
}
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   213
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   214
## 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
   215
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   216
#   link_zone   $view   $zone   [$base]
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   217
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   218
# Looks for shared zone at:
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   219
#   $ZONES/$view/$base
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   220
#   $ZONES/common/$base
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   221
function link_zone {
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   222
    local view=$1
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   223
    local zone=$2
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   224
    local base=${3:-$zone}
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   225
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   226
    local out=$ZONES/$view/$zone
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   227
    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
   228
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   229
    link $out $tgt
62
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   230
}
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   231
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
   232
## 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
   233
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
   234
    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
   235
    local base=${2:-$conf}
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   236
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
   237
    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
   238
    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
   239
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   240
    link $out $tgt
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   241
}
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   242
64
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
   243
## 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
   244
function copy_dhcp_conf {
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
   245
    local conf=$1
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
   246
    local base=${2:-$conf}
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
   247
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
   248
    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
   249
    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
   250
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   251
    copy $out $src
64
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
   252
}
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
   253
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   254
## Test hosts zone for validity using pvl.hosts-check:
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   255
#
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   256
#   check_hosts     .../hosts
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   257
function check_hosts {
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   258
    local hosts=$1; shift 1
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   259
    
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   260
    # TODO
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   261
    check $hosts \
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   262
        $OPT/bin/pvl.hosts-check $hosts
52
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
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   265
## 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
   266
#
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   267
#   check_zone      ..../$zone $origin
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   268
function check_zone {
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   269
    local zone=$1
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   270
    local origin=$2
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   271
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   272
    # checkzone is very specific about the order of arguments, -q must be first
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   273
    check $zone $NAMED_CHECKZONE $origin $zone
52
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
62
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   276
## 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
   277
#
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   278
#   check_dhcp      [$conf]
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   279
#
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   280
# 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
   281
# Fails if the check fails.
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   282
function check_dhcp {
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   283
    local conf=${1:-$DHCPD_CONF}
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   284
68
5a0335960591 update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents: 66
diff changeset
   285
    if [ ! -e $DHCPD ]; then
5a0335960591 update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents: 66
diff changeset
   286
        log_warn "check_dhcp: dhcpd not installed, skipping: $conf"
5a0335960591 update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents: 66
diff changeset
   287
        return 0
5a0335960591 update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents: 66
diff changeset
   288
    fi
5a0335960591 update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents: 66
diff changeset
   289
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   290
    check $conf \
66
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   291
        $DHCPD -cf $conf -t
62
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   292
}
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   293
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
   294
## 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
   295
#
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
   296
#   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
   297
#
a88766722d18 update: rename dhcp hosts -> dhcp conf, makes more sense; check input files before linking
Tero Marttila <terom@paivola.fi>
parents: 62
diff changeset
   298
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
   299
    local conf=$1;
62
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
    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
   302
}
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   303
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   304
### Deploy
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   305
## 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
   306
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
   307
    # run
b0c761c4d5f8 update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents: 57
diff changeset
   308
    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
   309
        $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
   310
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   311
    # set flag
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   312
    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
   313
}
b0c761c4d5f8 update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents: 57
diff changeset
   314
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   315
## Load update zonefiles into bind:
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   316
#
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
   317
#   reload_zones    
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   318
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   319
# 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
   320
function reload_zones {
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   321
    local msg="Reload zones"
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   322
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
   323
    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
   324
        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
   325
        
66
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   326
        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
   327
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
   328
    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
   329
        log_noop    "$msg: skipped"
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   330
    
68
5a0335960591 update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents: 66
diff changeset
   331
    elif [ ! -e $RNDC ]; then
5a0335960591 update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents: 66
diff changeset
   332
        log_warn "reload_zones: rndc not installed, skipping"
5a0335960591 update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents: 66
diff changeset
   333
5a0335960591 update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents: 66
diff changeset
   334
    elif [ ! -e $RNDC_KEY ]; then
5a0335960591 update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents: 66
diff changeset
   335
        log_warn   "  $msg: rndc: key not found: $RNDC_KEY"
5a0335960591 update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents: 66
diff changeset
   336
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   337
    elif [ ! -r $RNDC_KEY ]; then
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   338
        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
   339
59
b0c761c4d5f8 update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents: 57
diff changeset
   340
        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
   341
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   342
    else
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   343
        log_update  "$msg..."
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   344
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   345
        # run
66
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   346
        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
   347
    fi
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   348
}
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   349
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   350
## 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
   351
#
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   352
#   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
   353
#
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   354
# 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
   355
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
   356
    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
   357
        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
   358
    else
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   359
        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
   360
    fi
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   361
}
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   362
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   363
## 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
   364
#
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   365
#   reload_dhcp
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   366
#
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   367
# 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
   368
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
   369
    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
   370
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   371
    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
   372
        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
   373
        
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   374
        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
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   376
    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
   377
        log_noop    "$msg: skipped"
68
5a0335960591 update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents: 66
diff changeset
   378
 
5a0335960591 update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents: 66
diff changeset
   379
    elif [ ! -e $DHCPD ]; then
5a0335960591 update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents: 66
diff changeset
   380
        log_warn "reload_dhcp: dhcpd not installed, skipping: $conf"
5a0335960591 update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents: 66
diff changeset
   381
   
66
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   382
    else
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   383
        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
   384
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   385
        # run
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   386
        do_reload_dhcp
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   387
    fi
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   388
}
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
   389
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   390
### Commit
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   391
## Perform `hg commit`
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
   392
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
   393
    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
   394
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
   395
    [ $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
   396
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
   397
    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
   398
}
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
   399
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
   400
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   401
## Commit changes to version control:
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   402
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   403
#   commit_data
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   404
#
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   405
# Invokes `hg commit`, first showing the diff.
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   406
function commit_data {
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   407
    local commit_msg="$COMMIT_MSG"
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   408
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   409
    local msg="Commit changes"
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   410
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   411
    # operate?
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   412
    if [ $COMMIT_FORCE ]; then
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   413
        log_force   "$msg..."
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   414
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   415
        do_commit "$commit_msg"
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   416
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   417
    elif ! hg_modified; then
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   418
        log_skip    "$msg: no changes"
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
    elif [ $COMMIT_SKIP ]; then
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   421
        log_noop    "$msg: skipped"
57
d83a5e9be193 update: use hg diff --stat for .serials
Tero Marttila <terom@paivola.fi>
parents: 52
diff changeset
   422
        
d83a5e9be193 update: use hg diff --stat for .serials
Tero Marttila <terom@paivola.fi>
parents: 52
diff changeset
   423
        # still show diff, though
d83a5e9be193 update: use hg diff --stat for .serials
Tero Marttila <terom@paivola.fi>
parents: 52
diff changeset
   424
        [ $LOG_DIFF ] && indent "    " hg_diff
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   425
    else
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   426
        log_update  "$msg..."
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   427
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   428
        do_commit "$commit_msg"
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   429
    fi
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   430
}