lib/update.operations
author Tero Marttila <terom@paivola.fi>
Sun, 22 Dec 2013 15:33:32 +0200
changeset 98 a3734856e0fa
parent 96 bed4765fc56f
child 99 934aab83b769
permissions -rw-r--r--
use hosts/dhcp/%** to create dhcp hosts configs
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
92
639a5093039b lib/update.operations: update_domain_forward/reverse: use --add-origin, unless hosts name does not include a .
Tero Marttila <terom@paivola.fi>
parents: 91
diff changeset
    60
93
1a313b7b6d40 change how hosts forward zones are generated, to use a similar technique as for reverse zones, with both using etc/hosts/{forward,reverse} -> var/zones/hosts/{forward,reverse}
Tero Marttila <terom@paivola.fi>
parents: 92
diff changeset
    61
    if check_update "$out" "$@"; then
1a313b7b6d40 change how hosts forward zones are generated, to use a similar technique as for reverse zones, with both using etc/hosts/{forward,reverse} -> var/zones/hosts/{forward,reverse}
Tero Marttila <terom@paivola.fi>
parents: 92
diff changeset
    62
        log_update "Generating forward hosts zone $out @ $domain <- $@..."
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    63
    
85
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
    64
        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
    65
            --hosts-charset=$CHARSET \
85
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
    66
            --forward-zone="$domain" \
93
1a313b7b6d40 change how hosts forward zones are generated, to use a similar technique as for reverse zones, with both using etc/hosts/{forward,reverse} -> var/zones/hosts/{forward,reverse}
Tero Marttila <terom@paivola.fi>
parents: 92
diff changeset
    67
             "$@"
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    68
    else
93
1a313b7b6d40 change how hosts forward zones are generated, to use a similar technique as for reverse zones, with both using etc/hosts/{forward,reverse} -> var/zones/hosts/{forward,reverse}
Tero Marttila <terom@paivola.fi>
parents: 92
diff changeset
    69
        log_skip "Generating forward hosts $out <- $@: not changed"
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    70
    fi
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    71
}
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    72
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    73
function update_hosts_dhcp {
84
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
    74
    local out=$1; shift
98
a3734856e0fa use hosts/dhcp/%** to create dhcp hosts configs
Tero Marttila <terom@paivola.fi>
parents: 96
diff changeset
    75
    local domain="$1"; shift
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    76
98
a3734856e0fa use hosts/dhcp/%** to create dhcp hosts configs
Tero Marttila <terom@paivola.fi>
parents: 96
diff changeset
    77
    if check_update $out "$@"; then
a3734856e0fa use hosts/dhcp/%** to create dhcp hosts configs
Tero Marttila <terom@paivola.fi>
parents: 96
diff changeset
    78
        log_update "Generating DHCP hosts $out @ $domain <- $@..."
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
    79
84
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
    80
        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
    81
            --hosts-charset=$CHARSET \
98
a3734856e0fa use hosts/dhcp/%** to create dhcp hosts configs
Tero Marttila <terom@paivola.fi>
parents: 96
diff changeset
    82
            --hosts-domain=$domain \
a3734856e0fa use hosts/dhcp/%** to create dhcp hosts configs
Tero Marttila <terom@paivola.fi>
parents: 96
diff changeset
    83
            "$@"
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    84
    else
98
a3734856e0fa use hosts/dhcp/%** to create dhcp hosts configs
Tero Marttila <terom@paivola.fi>
parents: 96
diff changeset
    85
        log_skip "Generating DHCP hosts $out <- $@: not changed"
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    86
    fi
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    87
}
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    88
84
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
    89
## 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
    90
#
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
    91
#   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
    92
function update_hosts_reverse {
85
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
    93
    local out="$1"; shift
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
    94
    local reverse="$1"; shift
84
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
    95
93
1a313b7b6d40 change how hosts forward zones are generated, to use a similar technique as for reverse zones, with both using etc/hosts/{forward,reverse} -> var/zones/hosts/{forward,reverse}
Tero Marttila <terom@paivola.fi>
parents: 92
diff changeset
    96
    if check_update "$out" "$@"; then
1a313b7b6d40 change how hosts forward zones are generated, to use a similar technique as for reverse zones, with both using etc/hosts/{forward,reverse} -> var/zones/hosts/{forward,reverse}
Tero Marttila <terom@paivola.fi>
parents: 92
diff changeset
    97
        log_update "Generating reverse hosts zone $out <- $@..."
84
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
    98
    
85
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
    99
        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
   100
            --hosts-charset=$CHARSET \
85
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
   101
            --reverse-zone="$reverse" \
93
1a313b7b6d40 change how hosts forward zones are generated, to use a similar technique as for reverse zones, with both using etc/hosts/{forward,reverse} -> var/zones/hosts/{forward,reverse}
Tero Marttila <terom@paivola.fi>
parents: 92
diff changeset
   102
            "$@"
84
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
   103
    else
93
1a313b7b6d40 change how hosts forward zones are generated, to use a similar technique as for reverse zones, with both using etc/hosts/{forward,reverse} -> var/zones/hosts/{forward,reverse}
Tero Marttila <terom@paivola.fi>
parents: 92
diff changeset
   104
        log_skip "Generating reverse hosts $out <- $@: not changed"
84
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
   105
    fi
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
   106
}
77df429f63a3 update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents: 82
diff changeset
   107
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
   108
## 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
   109
#
95
a756f317d083 update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents: 94
diff changeset
   110
#   do_update_serial .../serials/$zone  $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
   111
#
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
function do_update_serial {
95
a756f317d083 update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents: 94
diff changeset
   113
    local dst="$1"
a756f317d083 update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents: 94
diff changeset
   114
    local serial="$2"
61
22b58b938fd0 update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents: 60
diff changeset
   115
95
a756f317d083 update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents: 94
diff changeset
   116
    echo $serial > $dst
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
   117
}
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
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   120
## 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
   121
#
95
a756f317d083 update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents: 94
diff changeset
   122
#   update_serial   .../serials/$zone   $serial     $deps...
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   123
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   124
# Supports SERIAL_FORCE/NOOP.
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   125
# Updates $SERIALS/$zone.serial.
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   126
function update_serial {
95
a756f317d083 update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents: 94
diff changeset
   127
    local dst="$1"; shift
85
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
   128
    local serial="$1"; shift
95
a756f317d083 update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents: 94
diff changeset
   129
a756f317d083 update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents: 94
diff changeset
   130
    local old=$(test -e "$dst" && cat "$dst" || echo '')
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   131
    
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   132
    # test
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   133
    if [ $SERIAL_FORCE ]; then
95
a756f317d083 update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents: 94
diff changeset
   134
        log_force "Updating $dst: $old <- $serial: forced"
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   135
95
a756f317d083 update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents: 94
diff changeset
   136
        do_update_serial "$dst" "$serial"
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   137
95
a756f317d083 update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents: 94
diff changeset
   138
    elif ! check_update "$dst" "$@"; then
a756f317d083 update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents: 94
diff changeset
   139
        log_skip "Updating $dst: $old <- $serial: not changed"
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   140
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   141
    elif [ $SERIAL_NOOP ]; then
95
a756f317d083 update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents: 94
diff changeset
   142
        log_noop "Updating $dst: $old <- $serial: skipped"
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   143
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   144
    else
95
a756f317d083 update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents: 94
diff changeset
   145
        log_update "Updating $dst: $old <- $serial"
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   146
95
a756f317d083 update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents: 94
diff changeset
   147
        do_update_serial "$dst" "$serial"
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   148
    fi
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   149
}
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   150
85
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
   151
## 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
   152
#
85
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
   153
#   update_zone out/zones/$zone in/zones/$zone var/serials/$zone
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
   154
function update_zone {
95
a756f317d083 update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents: 94
diff changeset
   155
    local out="$1"; shift
a756f317d083 update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents: 94
diff changeset
   156
    local src="$1"; shift
a756f317d083 update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents: 94
diff changeset
   157
    local serial="$1"; shift
88
52d058780506 update_zone: handle noop'd serial
Tero Marttila <terom@paivola.fi>
parents: 85
diff changeset
   158
    local serial_opt=
52d058780506 update_zone: handle noop'd serial
Tero Marttila <terom@paivola.fi>
parents: 85
diff changeset
   159
52d058780506 update_zone: handle noop'd serial
Tero Marttila <terom@paivola.fi>
parents: 85
diff changeset
   160
    if [ -n "$serial" -a -f "$serial" ]; then
52d058780506 update_zone: handle noop'd serial
Tero Marttila <terom@paivola.fi>
parents: 85
diff changeset
   161
        serial_opt="--serial=$(cat "$serial")"
52d058780506 update_zone: handle noop'd serial
Tero Marttila <terom@paivola.fi>
parents: 85
diff changeset
   162
    elif [ $SERIAL_NOOP ]; then
52d058780506 update_zone: handle noop'd serial
Tero Marttila <terom@paivola.fi>
parents: 85
diff changeset
   163
        warn "$out: noop'd serial, omitting"
52d058780506 update_zone: handle noop'd serial
Tero Marttila <terom@paivola.fi>
parents: 85
diff changeset
   164
    else
52d058780506 update_zone: handle noop'd serial
Tero Marttila <terom@paivola.fi>
parents: 85
diff changeset
   165
        fail "$out: missing serial: $serial"
52d058780506 update_zone: handle noop'd serial
Tero Marttila <terom@paivola.fi>
parents: 85
diff changeset
   166
    fi
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   167
95
a756f317d083 update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents: 94
diff changeset
   168
    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
   169
        log_update "Generating $out <- $src..." 
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   170
85
4ad9c9b7cd0e update: many things
Tero Marttila <terom@paivola.fi>
parents: 84
diff changeset
   171
        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
   172
                --include-path=$SRV/var/zones   \
88
52d058780506 update_zone: handle noop'd serial
Tero Marttila <terom@paivola.fi>
parents: 85
diff changeset
   173
                $serial_opt
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   174
    else
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   175
        log_skip "Generating $out <- $src: not changed" 
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   176
    fi
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
91
acb2fb235eb2 use new var/dhcp/hosts layout with update_dhcp_conf
Tero Marttila <terom@paivola.fi>
parents: 90
diff changeset
   179
## 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
   180
function update_dhcp_conf {
acb2fb235eb2 use new var/dhcp/hosts layout with update_dhcp_conf
Tero Marttila <terom@paivola.fi>
parents: 90
diff changeset
   181
    local out="$1"
acb2fb235eb2 use new var/dhcp/hosts layout with update_dhcp_conf
Tero Marttila <terom@paivola.fi>
parents: 90
diff changeset
   182
    local src="$2"
acb2fb235eb2 use new var/dhcp/hosts layout with update_dhcp_conf
Tero Marttila <terom@paivola.fi>
parents: 90
diff changeset
   183
acb2fb235eb2 use new var/dhcp/hosts layout with update_dhcp_conf
Tero Marttila <terom@paivola.fi>
parents: 90
diff changeset
   184
    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
   185
        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
   186
            
acb2fb235eb2 use new var/dhcp/hosts layout with update_dhcp_conf
Tero Marttila <terom@paivola.fi>
parents: 90
diff changeset
   187
        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
   188
            --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
   189
    else
acb2fb235eb2 use new var/dhcp/hosts layout with update_dhcp_conf
Tero Marttila <terom@paivola.fi>
parents: 90
diff changeset
   190
        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
   191
    fi
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
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   194
## 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
   195
#
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   196
#   check_hosts     .../hosts
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   197
function check_hosts {
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   198
    local hosts=$1; shift 1
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   199
    
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   200
    # TODO
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   201
    check $hosts \
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   202
        $OPT/bin/pvl.hosts-check $hosts
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
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   205
## 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
   206
#
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   207
#   check_zone      ..../$zone $origin
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   208
function check_zone {
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   209
    local zone=$1
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   210
    local origin=$2
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   211
90
5b33ccac38ad update_zone --include-path, log_check
Tero Marttila <terom@paivola.fi>
parents: 89
diff changeset
   212
    log_check "Checking $zone @ $origin..." 
5b33ccac38ad update_zone --include-path, log_check
Tero Marttila <terom@paivola.fi>
parents: 89
diff changeset
   213
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   214
    # 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
   215
    check $zone $NAMED_CHECKZONE $origin $zone
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   216
}
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   217
62
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   218
## 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
   219
#
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   220
#   check_dhcp      [$conf]
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   221
#
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   222
# 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
   223
# Fails if the check fails.
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   224
function check_dhcp {
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   225
    local conf=${1:-$DHCPD_CONF}
90
5b33ccac38ad update_zone --include-path, log_check
Tero Marttila <terom@paivola.fi>
parents: 89
diff changeset
   226
    
5b33ccac38ad update_zone --include-path, log_check
Tero Marttila <terom@paivola.fi>
parents: 89
diff changeset
   227
    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
   228
68
5a0335960591 update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents: 66
diff changeset
   229
    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
   230
        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
   231
        return 0
5a0335960591 update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents: 66
diff changeset
   232
    fi
5a0335960591 update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents: 66
diff changeset
   233
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   234
    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
   235
        $DHCPD -cf $conf -t
62
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   236
}
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   237
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
   238
## 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
   239
#
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
   240
#   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
   241
#
a88766722d18 update: rename dhcp hosts -> dhcp conf, makes more sense; check input files before linking
Tero Marttila <terom@paivola.fi>
parents: 62
diff changeset
   242
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
   243
    local conf=$1;
62
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   244
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
   245
    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
   246
}
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   247
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   248
### Deploy
94
1b02d8075676 cleanup main update script somewhat
Tero Marttila <terom@paivola.fi>
parents: 93
diff changeset
   249
# set by do_reload_zone if zone data has actually been reloaded
1b02d8075676 cleanup main update script somewhat
Tero Marttila <terom@paivola.fi>
parents: 93
diff changeset
   250
RELOAD_ZONES=
1b02d8075676 cleanup main update script somewhat
Tero Marttila <terom@paivola.fi>
parents: 93
diff changeset
   251
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   252
## 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
   253
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
   254
    # run
b0c761c4d5f8 update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents: 57
diff changeset
   255
    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
   256
        $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
   257
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   258
    # set flag
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   259
    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
   260
}
b0c761c4d5f8 update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents: 57
diff changeset
   261
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   262
## Load update zonefiles into bind:
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   263
#
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
   264
#   reload_zones    
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   265
#
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   266
# 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
   267
function reload_zones {
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   268
    local msg="Reload zones"
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
    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
   271
        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
   272
        
66
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   273
        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
   274
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
   275
    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
   276
        log_noop    "$msg: skipped"
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   277
    
68
5a0335960591 update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents: 66
diff changeset
   278
    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
   279
        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
   280
5a0335960591 update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents: 66
diff changeset
   281
    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
   282
        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
   283
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   284
    elif [ ! -r $RNDC_KEY ]; then
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   285
        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
   286
59
b0c761c4d5f8 update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents: 57
diff changeset
   287
        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
   288
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   289
    else
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   290
        log_update  "$msg..."
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   291
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   292
        # run
66
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   293
        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
   294
    fi
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   295
}
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   296
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   297
## 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
   298
#
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_dhcp
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   300
#
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   301
# 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
   302
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
   303
    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
   304
        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
   305
    else
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   306
        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
   307
    fi
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   308
}
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   309
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   310
## 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
   311
#
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   312
#   reload_dhcp
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   313
#
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   314
# 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
   315
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
   316
    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
   317
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   318
    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
   319
        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
   320
        
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   321
        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
   322
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   323
    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
   324
        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
   325
 
5a0335960591 update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents: 66
diff changeset
   326
    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
   327
        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
   328
   
66
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   329
    else
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   330
        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
   331
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   332
        # run
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   333
        do_reload_dhcp
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   334
    fi
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   335
}
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
   336
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   337
### Commit
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   338
## Commit changes to version control:
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   339
#
96
bed4765fc56f fix hg commit message argument passing
Tero Marttila <terom@paivola.fi>
parents: 95
diff changeset
   340
#   update_commit .../etc "commit message"
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   341
#
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   342
# Invokes `hg commit`, first showing the diff.
95
a756f317d083 update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents: 94
diff changeset
   343
function update_commit {
96
bed4765fc56f fix hg commit message argument passing
Tero Marttila <terom@paivola.fi>
parents: 95
diff changeset
   344
    local repo="$1"
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   345
    local commit_msg="$COMMIT_MSG"
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   346
82
26a307558602 update update
Tero Marttila <terom@paivola.fi>
parents: 74
diff changeset
   347
    local msg="Commit changes"
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   348
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   349
    # operate?
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   350
    if [ $COMMIT_FORCE ]; then
95
a756f317d083 update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents: 94
diff changeset
   351
        log_force   "$msg: $commit_msg"
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   352
96
bed4765fc56f fix hg commit message argument passing
Tero Marttila <terom@paivola.fi>
parents: 95
diff changeset
   353
        [ $LOG_DIFF ] && indent "    " hg_diff $repo
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   354
96
bed4765fc56f fix hg commit message argument passing
Tero Marttila <terom@paivola.fi>
parents: 95
diff changeset
   355
        hg_commit "$repo" "$commit_msg"
bed4765fc56f fix hg commit message argument passing
Tero Marttila <terom@paivola.fi>
parents: 95
diff changeset
   356
bed4765fc56f fix hg commit message argument passing
Tero Marttila <terom@paivola.fi>
parents: 95
diff changeset
   357
    elif ! hg_modified "$repo"; then
89
51270237a6ff cleanup update, reintroduce separate hg repo
Tero Marttila <terom@paivola.fi>
parents: 88
diff changeset
   358
        log_warn    "$msg: no changes"
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   359
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   360
    elif [ $COMMIT_SKIP ]; then
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   361
        log_noop    "$msg: skipped"
57
d83a5e9be193 update: use hg diff --stat for .serials
Tero Marttila <terom@paivola.fi>
parents: 52
diff changeset
   362
        
d83a5e9be193 update: use hg diff --stat for .serials
Tero Marttila <terom@paivola.fi>
parents: 52
diff changeset
   363
        # still show diff, though
96
bed4765fc56f fix hg commit message argument passing
Tero Marttila <terom@paivola.fi>
parents: 95
diff changeset
   364
        [ $LOG_DIFF ] && indent "    " hg_diff "$repo"
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   365
    else
95
a756f317d083 update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents: 94
diff changeset
   366
        log_update  "$msg: $commit_msg"
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   367
96
bed4765fc56f fix hg commit message argument passing
Tero Marttila <terom@paivola.fi>
parents: 95
diff changeset
   368
        [ $LOG_DIFF ] && indent "    " hg_diff $repo
bed4765fc56f fix hg commit message argument passing
Tero Marttila <terom@paivola.fi>
parents: 95
diff changeset
   369
bed4765fc56f fix hg commit message argument passing
Tero Marttila <terom@paivola.fi>
parents: 95
diff changeset
   370
        hg_commit "$repo" "$commit_msg"
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   371
    fi
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   372
}