lib/update.operations
author Tero Marttila <terom@paivola.fi>
Tue, 17 Dec 2013 01:17:49 +0200
branchdns-new
changeset 84 77df429f63a3
parent 82 26a307558602
child 85 4ad9c9b7cd0e
permissions -rw-r--r--
update: full host forward/dhcp/reverse zones
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
#
84
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
    73
#   update_hosts_forward out/hosts/$hosts $hosts in/hosts/$hosts
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    74
function update_hosts_forward {
84
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
    75
    local out=$1; shift
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
    76
    local domain=$1; shift
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
    77
    local src=$1; shift
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    78
84
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
    79
    if check_update $out $src "$@"; then
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
    80
        log_update "Generating forward hosts zone $out <- $src..."
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    81
    
84
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
    82
        do_update $out $OPT/bin/pvl.hosts-dns \
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
    83
            --hosts-charset=$CHARSET \
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
    84
            --forward-zone=$domain \
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
    85
             $src "$@"
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    86
    
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    87
    else
84
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
    88
        log_skip "Generating forward hosts $out <- $src: not changed"
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    89
    fi
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    90
}
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    91
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    92
function update_hosts_dhcp {
84
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
    93
    local out=$1; shift
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
    94
    local src=$1; shift
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    95
84
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
    96
    if check_update $out $src "$@"; then
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    97
        log_update "Generating DHCP hosts $out <- $src..."
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    98
84
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
    99
        do_update $out $OPT/bin/pvl.hosts-dhcp \
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
   100
            --hosts-charset=$CHARSET \
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
   101
            $src "$@"
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   102
    else
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   103
        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
   104
    fi
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   105
}
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   106
84
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
   107
## Generate reverse zone from hosts hosts using pvl.hosts-dns:
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
   108
#
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
   109
#   update_hosts_reverse out/hosts/$reverse $reverse in/hosts/$hosts
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
   110
function update_hosts_reverse {
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
   111
    local out=$1; shift
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
   112
    local reverse=$1; shift
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
   113
    local src=$1; shift
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
   114
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
   115
    if check_update $out $src "$@"; then
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
   116
        log_update "Generating reverse hosts zone $out <- $src..."
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
   117
    
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
   118
        do_update $out $OPT/bin/pvl.hosts-dns \
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
   119
            --hosts-charset=$CHARSET \
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
   120
            --reverse-zone=$reverse \
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
   121
            $src "$@"
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
   122
    
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
   123
    else
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
   124
        log_skip "Generating reverse hosts $out <- $src: not changed"
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
   125
    fi
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
   126
}
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
   127
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
   128
## 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
   129
#
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
   130
#   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
   131
#
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
   132
# 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
   133
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
   134
    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
   135
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
   136
    # read
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   137
    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
   138
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   139
    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
   140
    
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
   141
    # read
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   142
    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
   143
        
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
   144
    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
   145
}
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
   146
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
   147
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   148
## 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
   149
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   150
#   update_serial   $zone   $deps...
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   151
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   152
# Supports SERIAL_FORCE/NOOP.
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   153
# Updates $SERIALS/$zone.serial.
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   154
function update_serial {
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   155
    local serial=$1; shift
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   156
    
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   157
    # test
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   158
    if [ $SERIAL_FORCE ]; then
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   159
        log_force "Updating $serial: forced"
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   160
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   161
        do_update_serial $serial
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
    elif ! check_update $serial "$@"; then
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   164
        log_skip "Updating $serial: not changed"
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
    elif [ $SERIAL_NOOP ]; then
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   167
        log_noop "Updating $serial: skipped"
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
    else
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   170
        log_update "Updating $serial..."
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
        do_update_serial $serial
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   173
    fi
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   174
}
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   175
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   176
## 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
   177
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   178
#   link_serial $zone $base
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   179
function link_serial {
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   180
    local zone=$1
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   181
    local base=$2
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   182
62
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   183
    local out=$SERIALS/$zone.serial
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   184
    local tgt=$SERIALS/$base.serial
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   185
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   186
    link $out $tgt
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   187
}
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
## Update zone file verbatim from source:
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   190
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   191
#   copy_zone   $view   $zone   [$base]
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   192
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   193
# 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
   194
function copy_zone {
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   195
    local view=$1
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   196
    local zone=$2
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   197
    local base=${3:-$zone}
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
    local out=$ZONES/$view/$zone
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   200
    local src=$DATA/$base
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   201
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   202
    copy $out $src
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
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
   205
## 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
   206
#
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
   207
#   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
   208
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
   209
    # 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
   210
    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
   211
        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
   212
            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
   213
            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
   214
        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
   215
    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
   216
    
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
   217
    # 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
   218
    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
   219
}
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
   220
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   221
## 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
   222
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   223
#   update_zone $view   $zone   [$base]
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   224
function update_zone {
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   225
    local out=$1
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   226
    local src=$2
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   227
    local serial=$3
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   228
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   229
    if check_update $out $src $serial; then
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   230
        log_update "Generating $out <- $src..." 
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   231
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   232
        do_update $out $OPT/bin/pvl.dns-zone $src \
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   233
                --serial $(cat $serial)
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   234
    else
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   235
        log_skip "Generating $out <- $src: not changed" 
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   236
    fi
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   237
}
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   238
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   239
## 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
   240
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   241
#   link_zone   $view   $zone   [$base]
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
# Looks for shared zone at:
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   244
#   $ZONES/$view/$base
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   245
#   $ZONES/common/$base
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   246
function link_zone {
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   247
    local view=$1
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   248
    local zone=$2
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   249
    local base=${3:-$zone}
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   250
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   251
    local out=$ZONES/$view/$zone
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   252
    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
   253
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   254
    link $out $tgt
62
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   255
}
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   256
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
   257
## 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
   258
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
   259
    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
   260
    local base=${2:-$conf}
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   261
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
   262
    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
   263
    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
   264
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   265
    link $out $tgt
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   266
}
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   267
64
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
   268
## 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
   269
function copy_dhcp_conf {
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
   270
    local conf=$1
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
   271
    local base=${2:-$conf}
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
   272
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
   273
    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
   274
    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
   275
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   276
    copy $out $src
64
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
   277
}
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
   278
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   279
## 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
   280
#
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   281
#   check_hosts     .../hosts
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   282
function check_hosts {
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   283
    local hosts=$1; shift 1
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   284
    
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   285
    # TODO
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   286
    check $hosts \
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   287
        $OPT/bin/pvl.hosts-check $hosts
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   288
}
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   289
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   290
## 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
   291
#
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   292
#   check_zone      ..../$zone $origin
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   293
function check_zone {
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   294
    local zone=$1
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   295
    local origin=$2
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   296
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   297
    # 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
   298
    check $zone $NAMED_CHECKZONE $origin $zone
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   299
}
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   300
62
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   301
## 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
   302
#
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   303
#   check_dhcp      [$conf]
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   304
#
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   305
# 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
   306
# Fails if the check fails.
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   307
function check_dhcp {
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   308
    local conf=${1:-$DHCPD_CONF}
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   309
68
5a0335960591 update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents: 66
diff changeset
   310
    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
   311
        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
   312
        return 0
5a0335960591 update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents: 66
diff changeset
   313
    fi
5a0335960591 update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents: 66
diff changeset
   314
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   315
    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
   316
        $DHCPD -cf $conf -t
62
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   317
}
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   318
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
   319
## 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
   320
#
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
   321
#   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
   322
#
a88766722d18 update: rename dhcp hosts -> dhcp conf, makes more sense; check input files before linking
Tero Marttila <terom@paivola.fi>
parents: 62
diff changeset
   323
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
   324
    local conf=$1;
62
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   325
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
   326
    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
   327
}
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   328
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   329
### Deploy
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
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
    
68
5a0335960591 update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents: 66
diff changeset
   356
    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
   357
        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
   358
5a0335960591 update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents: 66
diff changeset
   359
    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
   360
        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
   361
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   362
    elif [ ! -r $RNDC_KEY ]; then
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   363
        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
   364
59
b0c761c4d5f8 update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents: 57
diff changeset
   365
        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
   366
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   367
    else
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   368
        log_update  "$msg..."
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   369
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   370
        # run
66
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_zones
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   372
    fi
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
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   375
## 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
   376
#
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   377
#   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
   378
#
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   379
# 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
   380
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
   381
    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
   382
        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
   383
    else
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   384
        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
   385
    fi
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   386
}
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   387
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   388
## 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
#   reload_dhcp
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   391
#
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   392
# 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
   393
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
   394
    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
   395
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   396
    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
   397
        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
   398
        
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   399
        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
   400
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   401
    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
   402
        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
   403
 
5a0335960591 update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents: 66
diff changeset
   404
    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
   405
        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
   406
   
66
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   407
    else
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   408
        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
   409
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   410
        # run
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   411
        do_reload_dhcp
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   412
    fi
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   413
}
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
   414
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   415
### Commit
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   416
## 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
   417
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
   418
    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
   419
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
   420
    [ $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
   421
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
   422
    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
   423
}
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
   424
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
   425
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   426
## Commit changes to version control:
52
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
#   commit_data
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   429
#
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   430
# 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
   431
function commit_data {
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   432
    local commit_msg="$COMMIT_MSG"
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   433
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   434
    local msg="Commit changes"
52
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
    # operate?
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   437
    if [ $COMMIT_FORCE ]; then
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   438
        log_force   "$msg..."
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   439
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   440
        do_commit "$commit_msg"
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   441
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   442
    elif ! hg_modified; then
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   443
        log_skip    "$msg: no changes"
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   444
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   445
    elif [ $COMMIT_SKIP ]; then
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   446
        log_noop    "$msg: skipped"
57
d83a5e9be193 update: use hg diff --stat for .serials
Tero Marttila <terom@paivola.fi>
parents: 52
diff changeset
   447
        
d83a5e9be193 update: use hg diff --stat for .serials
Tero Marttila <terom@paivola.fi>
parents: 52
diff changeset
   448
        # still show diff, though
d83a5e9be193 update: use hg diff --stat for .serials
Tero Marttila <terom@paivola.fi>
parents: 52
diff changeset
   449
        [ $LOG_DIFF ] && indent "    " hg_diff
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   450
    else
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   451
        log_update  "$msg..."
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   452
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   453
        do_commit "$commit_msg"
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   454
    fi
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   455
}