lib/update.operations
author Tero Marttila <terom@paivola.fi>
Thu, 19 Dec 2013 18:55:53 +0200
branchdns-new
changeset 91 acb2fb235eb2
parent 90 5b33ccac38ad
child 92 639a5093039b
permissions -rw-r--r--
use new var/dhcp/hosts layout with update_dhcp_conf
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 {
85
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
     7
    local out="$1"
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
     8
    local tgt="$2"
62
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
     9
85
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
    10
    if check_link "$out" "$tgt"; then
62
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
85
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
    13
        do_link "$out" "$tgt"
62
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 {
85
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
    21
    local out="$1"
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
    22
    local src="$2"
64
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
    23
85
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
    24
    if check_update "$out" "$src"; then
64
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
85
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
    27
        do_update "$out" \
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
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 {
85
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
    39
    local src="$1"; shift
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
    40
    local cmd="$1"; shift
66
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
    41
85
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
    42
    if cmd_test "$cmd" -q "$@"; then
66
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
85
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
    48
        indent "    " "$cmd" "$@"
66
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
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    54
## 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
    55
#
84
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
    56
#   update_hosts_forward out/hosts/$hosts $hosts in/hosts/$hosts
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    57
function update_hosts_forward {
85
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
    58
    local out="$1"; shift
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
    59
    local domain="$1"; shift
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
    60
    local src="$1"; shift
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    61
85
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
    62
    if check_update "$out" "$src" "$@"; then
84
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
    63
        log_update "Generating forward hosts zone $out <- $src..."
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    64
    
85
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
    65
        do_update "$out" $OPT/bin/pvl.hosts-dns \
84
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
    66
            --hosts-charset=$CHARSET \
85
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
    67
            --forward-zone="$domain" \
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
    68
             "$src" "$@"
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    69
    
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    70
    else
84
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
    71
        log_skip "Generating forward hosts $out <- $src: not changed"
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    72
    fi
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    73
}
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    74
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    75
function update_hosts_dhcp {
84
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
    76
    local out=$1; shift
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
    77
    local src=$1; shift
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
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
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    80
        log_update "Generating DHCP hosts $out <- $src..."
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-dhcp \
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
            $src "$@"
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    85
    else
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    86
        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
    87
    fi
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    88
}
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    89
84
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
    90
## 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
    91
#
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
    92
#   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
    93
function update_hosts_reverse {
85
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
    94
    local out="$1"; shift
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
    95
    local reverse="$1"; shift
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
    96
    local src="$1"; shift
84
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
    97
85
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
    98
    if check_update "$out" "$src" "$@"; then
84
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
    99
        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
   100
    
85
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
   101
        do_update "$out" $OPT/bin/pvl.hosts-dns \
84
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
   102
            --hosts-charset=$CHARSET \
85
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
   103
            --reverse-zone="$reverse" \
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
   104
            "$src" "$@"
84
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
   105
    
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
   106
    else
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
   107
        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
   108
    fi
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
   109
}
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
   110
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
   111
## 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
   112
#
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
#   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
   114
#
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
# 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
   116
function do_update_serial {
85
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
   117
    local serial="$1"
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
    # read
85
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
   120
    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
   121
85
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
   122
    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
   123
    
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
   124
    # read
85
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
   125
    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
   126
        
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
   127
    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
   128
}
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
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   131
## 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
   132
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   133
#   update_serial   $zone   $deps...
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   134
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   135
# Supports SERIAL_FORCE/NOOP.
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   136
# Updates $SERIALS/$zone.serial.
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   137
function update_serial {
85
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
   138
    local serial="$1"; shift
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   139
    
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   140
    # test
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   141
    if [ $SERIAL_FORCE ]; then
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   142
        log_force "Updating $serial: forced"
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   143
85
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
   144
        do_update_serial "$serial"
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   145
85
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
   146
    elif ! check_update "$serial" "$@"; then
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   147
        log_skip "Updating $serial: not changed"
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   148
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   149
    elif [ $SERIAL_NOOP ]; then
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   150
        log_noop "Updating $serial: skipped"
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
    else
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   153
        log_update "Updating $serial..."
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   154
85
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
   155
        do_update_serial "$serial"
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   156
    fi
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   157
}
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   158
85
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
   159
## Generate 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
   160
#
85
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
   161
#   update_zone out/zones/$zone in/zones/$zone var/serials/$zone
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
   162
function update_zone {
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
   163
    local out="$1"
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
   164
    local src="$2"
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
   165
    local serial="$3"
88
52d058780506 update_zone: handle noop'd serial
Tero Marttila <terom@paivola.fi>
parents: 85
diff changeset
   166
    local serial_opt=
52d058780506 update_zone: handle noop'd serial
Tero Marttila <terom@paivola.fi>
parents: 85
diff changeset
   167
52d058780506 update_zone: handle noop'd serial
Tero Marttila <terom@paivola.fi>
parents: 85
diff changeset
   168
    if [ -n "$serial" -a -f "$serial" ]; then
52d058780506 update_zone: handle noop'd serial
Tero Marttila <terom@paivola.fi>
parents: 85
diff changeset
   169
        serial_opt="--serial=$(cat "$serial")"
52d058780506 update_zone: handle noop'd serial
Tero Marttila <terom@paivola.fi>
parents: 85
diff changeset
   170
52d058780506 update_zone: handle noop'd serial
Tero Marttila <terom@paivola.fi>
parents: 85
diff changeset
   171
    elif [ $SERIAL_NOOP ]; then
52d058780506 update_zone: handle noop'd serial
Tero Marttila <terom@paivola.fi>
parents: 85
diff changeset
   172
        warn "$out: noop'd serial, omitting"
52d058780506 update_zone: handle noop'd serial
Tero Marttila <terom@paivola.fi>
parents: 85
diff changeset
   173
    else
52d058780506 update_zone: handle noop'd serial
Tero Marttila <terom@paivola.fi>
parents: 85
diff changeset
   174
        fail "$out: missing serial: $serial"
52d058780506 update_zone: handle noop'd serial
Tero Marttila <terom@paivola.fi>
parents: 85
diff changeset
   175
    fi
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   176
85
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
   177
    if check_update "$out" "$src" "$serial"; then
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   178
        log_update "Generating $out <- $src..." 
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   179
85
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
   180
        do_update "$out" $OPT/bin/pvl.dns-zone "$src" \
90
5b33ccac38ad update_zone --include-path, log_check
Tero Marttila <terom@paivola.fi>
parents: 89
diff changeset
   181
                --include-path=$SRV/var/zones   \
88
52d058780506 update_zone: handle noop'd serial
Tero Marttila <terom@paivola.fi>
parents: 85
diff changeset
   182
                $serial_opt
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   183
    else
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   184
        log_skip "Generating $out <- $src: not changed" 
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   185
    fi
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   186
}
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   187
91
acb2fb235eb2 use new var/dhcp/hosts layout with update_dhcp_conf
Tero Marttila <terom@paivola.fi>
parents: 90
diff changeset
   188
## Generate dhcp confs from source using pvl.dhcp-conf:
acb2fb235eb2 use new var/dhcp/hosts layout with update_dhcp_conf
Tero Marttila <terom@paivola.fi>
parents: 90
diff changeset
   189
function update_dhcp_conf {
acb2fb235eb2 use new var/dhcp/hosts layout with update_dhcp_conf
Tero Marttila <terom@paivola.fi>
parents: 90
diff changeset
   190
    local out="$1"
acb2fb235eb2 use new var/dhcp/hosts layout with update_dhcp_conf
Tero Marttila <terom@paivola.fi>
parents: 90
diff changeset
   191
    local src="$2"
acb2fb235eb2 use new var/dhcp/hosts layout with update_dhcp_conf
Tero Marttila <terom@paivola.fi>
parents: 90
diff changeset
   192
acb2fb235eb2 use new var/dhcp/hosts layout with update_dhcp_conf
Tero Marttila <terom@paivola.fi>
parents: 90
diff changeset
   193
    if check_update "$out" "$src"; then
acb2fb235eb2 use new var/dhcp/hosts layout with update_dhcp_conf
Tero Marttila <terom@paivola.fi>
parents: 90
diff changeset
   194
        log_update "Generating $out <- $src..."
acb2fb235eb2 use new var/dhcp/hosts layout with update_dhcp_conf
Tero Marttila <terom@paivola.fi>
parents: 90
diff changeset
   195
            
acb2fb235eb2 use new var/dhcp/hosts layout with update_dhcp_conf
Tero Marttila <terom@paivola.fi>
parents: 90
diff changeset
   196
        do_update "$out" $OPT/bin/pvl.dhcp-conf "$src" \
acb2fb235eb2 use new var/dhcp/hosts layout with update_dhcp_conf
Tero Marttila <terom@paivola.fi>
parents: 90
diff changeset
   197
            --include-path=$SRV/var/dhcp
acb2fb235eb2 use new var/dhcp/hosts layout with update_dhcp_conf
Tero Marttila <terom@paivola.fi>
parents: 90
diff changeset
   198
    else
acb2fb235eb2 use new var/dhcp/hosts layout with update_dhcp_conf
Tero Marttila <terom@paivola.fi>
parents: 90
diff changeset
   199
        log_skip "Generating $out <- $src: not changed"
acb2fb235eb2 use new var/dhcp/hosts layout with update_dhcp_conf
Tero Marttila <terom@paivola.fi>
parents: 90
diff changeset
   200
    fi
acb2fb235eb2 use new var/dhcp/hosts layout with update_dhcp_conf
Tero Marttila <terom@paivola.fi>
parents: 90
diff changeset
   201
}
acb2fb235eb2 use new var/dhcp/hosts layout with update_dhcp_conf
Tero Marttila <terom@paivola.fi>
parents: 90
diff changeset
   202
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   203
## 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
   204
#
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   205
#   check_hosts     .../hosts
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   206
function check_hosts {
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   207
    local hosts=$1; shift 1
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   208
    
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   209
    # TODO
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   210
    check $hosts \
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   211
        $OPT/bin/pvl.hosts-check $hosts
52
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
## 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
   215
#
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   216
#   check_zone      ..../$zone $origin
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   217
function check_zone {
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   218
    local zone=$1
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   219
    local origin=$2
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   220
90
5b33ccac38ad update_zone --include-path, log_check
Tero Marttila <terom@paivola.fi>
parents: 89
diff changeset
   221
    log_check "Checking $zone @ $origin..." 
5b33ccac38ad update_zone --include-path, log_check
Tero Marttila <terom@paivola.fi>
parents: 89
diff changeset
   222
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   223
    # 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
   224
    check $zone $NAMED_CHECKZONE $origin $zone
52
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
62
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   227
## 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
   228
#
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   229
#   check_dhcp      [$conf]
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   230
#
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   231
# 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
   232
# Fails if the check fails.
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   233
function check_dhcp {
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   234
    local conf=${1:-$DHCPD_CONF}
90
5b33ccac38ad update_zone --include-path, log_check
Tero Marttila <terom@paivola.fi>
parents: 89
diff changeset
   235
    
5b33ccac38ad update_zone --include-path, log_check
Tero Marttila <terom@paivola.fi>
parents: 89
diff changeset
   236
    log_check "Checking DHCP $conf..." 
62
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   237
68
5a0335960591 update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents: 66
diff changeset
   238
    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
   239
        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
   240
        return 0
5a0335960591 update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents: 66
diff changeset
   241
    fi
5a0335960591 update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents: 66
diff changeset
   242
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   243
    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
   244
        $DHCPD -cf $conf -t
62
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   245
}
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   246
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
   247
## 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
   248
#
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
   249
#   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
   250
#
a88766722d18 update: rename dhcp hosts -> dhcp conf, makes more sense; check input files before linking
Tero Marttila <terom@paivola.fi>
parents: 62
diff changeset
   251
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
   252
    local conf=$1;
62
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   253
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
   254
    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
   255
}
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   256
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   257
### Deploy
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   258
## 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
   259
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
   260
    # run
b0c761c4d5f8 update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents: 57
diff changeset
   261
    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
   262
        $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
   263
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   264
    # set flag
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   265
    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
   266
}
b0c761c4d5f8 update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents: 57
diff changeset
   267
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   268
## Load update zonefiles into bind:
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   269
#
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
   270
#   reload_zones    
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   271
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   272
# 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
   273
function reload_zones {
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   274
    local msg="Reload zones"
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   275
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
   276
    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
   277
        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
   278
        
66
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   279
        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
   280
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
   281
    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
   282
        log_noop    "$msg: skipped"
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   283
    
68
5a0335960591 update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents: 66
diff changeset
   284
    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
   285
        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
   286
5a0335960591 update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents: 66
diff changeset
   287
    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
   288
        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
   289
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   290
    elif [ ! -r $RNDC_KEY ]; then
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   291
        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
   292
59
b0c761c4d5f8 update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents: 57
diff changeset
   293
        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
   294
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   295
    else
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   296
        log_update  "$msg..."
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   297
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   298
        # run
66
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   299
        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
   300
    fi
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   301
}
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   302
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   303
## 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
   304
#
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   305
#   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
   306
#
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   307
# 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
   308
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
   309
    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
   310
        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
   311
    else
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   312
        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
   313
    fi
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   314
}
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   315
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   316
## 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
   317
#
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   318
#   reload_dhcp
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   319
#
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   320
# 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
   321
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
   322
    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
   323
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   324
    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
   325
        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
   326
        
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   327
        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
   328
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   329
    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
   330
        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
   331
 
5a0335960591 update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents: 66
diff changeset
   332
    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
   333
        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
   334
   
66
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   335
    else
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   336
        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
   337
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   338
        # run
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   339
        do_reload_dhcp
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   340
    fi
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
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   343
### Commit
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   344
## 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
   345
function do_commit {
89
51270237a6ff cleanup update, reintroduce separate hg repo
Tero Marttila <terom@paivola.fi>
parents: 88
diff changeset
   346
    local repo=$1
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
   347
    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
   348
89
51270237a6ff cleanup update, reintroduce separate hg repo
Tero Marttila <terom@paivola.fi>
parents: 88
diff changeset
   349
    [ $LOG_DIFF ] && indent "    " hg_diff $repo
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
   350
89
51270237a6ff cleanup update, reintroduce separate hg repo
Tero Marttila <terom@paivola.fi>
parents: 88
diff changeset
   351
    hg_commit $repo "$msg"
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
   352
}
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
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
   354
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   355
## Commit changes to version control:
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   356
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   357
#   commit_data
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   358
#
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   359
# Invokes `hg commit`, first showing the diff.
89
51270237a6ff cleanup update, reintroduce separate hg repo
Tero Marttila <terom@paivola.fi>
parents: 88
diff changeset
   360
function commit {
51270237a6ff cleanup update, reintroduce separate hg repo
Tero Marttila <terom@paivola.fi>
parents: 88
diff changeset
   361
    local repo=$1
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   362
    local commit_msg="$COMMIT_MSG"
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   363
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   364
    local msg="Commit changes"
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   365
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   366
    # operate?
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   367
    if [ $COMMIT_FORCE ]; then
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   368
        log_force   "$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
        do_commit "$commit_msg"
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   371
89
51270237a6ff cleanup update, reintroduce separate hg repo
Tero Marttila <terom@paivola.fi>
parents: 88
diff changeset
   372
    elif ! hg_modified $repo; then
51270237a6ff cleanup update, reintroduce separate hg repo
Tero Marttila <terom@paivola.fi>
parents: 88
diff changeset
   373
        log_warn    "$msg: no changes"
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   374
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   375
    elif [ $COMMIT_SKIP ]; then
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   376
        log_noop    "$msg: skipped"
57
d83a5e9be193 update: use hg diff --stat for .serials
Tero Marttila <terom@paivola.fi>
parents: 52
diff changeset
   377
        
d83a5e9be193 update: use hg diff --stat for .serials
Tero Marttila <terom@paivola.fi>
parents: 52
diff changeset
   378
        # still show diff, though
89
51270237a6ff cleanup update, reintroduce separate hg repo
Tero Marttila <terom@paivola.fi>
parents: 88
diff changeset
   379
        [ $LOG_DIFF ] && indent "    " hg_diff $repo
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   380
    else
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   381
        log_update  "$msg..."
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   382
89
51270237a6ff cleanup update, reintroduce separate hg repo
Tero Marttila <terom@paivola.fi>
parents: 88
diff changeset
   383
        do_commit $repo "$commit_msg"
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   384
    fi
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   385
}