author | Tero Marttila <terom@paivola.fi> |
Thu, 19 Dec 2013 23:52:17 +0200 | |
branch | dns-new |
changeset 619 | bed4765fc56f |
parent 618 | a756f317d083 |
child 621 | a3734856e0fa |
permissions | -rw-r--r-- |
583
b65ce9123039
lib/update: add shebangs to make sloccount work
Tero Marttila <terom@paivola.fi>
parents:
582
diff
changeset
|
1 |
#!/bin/bash |
575
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 |
|
605 | 6 |
function link { |
608 | 7 |
local out="$1" |
8 |
local tgt="$2" |
|
585
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
584
diff
changeset
|
9 |
|
608 | 10 |
if check_link "$out" "$tgt"; then |
585
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
584
diff
changeset
|
11 |
log_update "Linking $out -> $tgt..." |
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
584
diff
changeset
|
12 |
|
608 | 13 |
do_link "$out" "$tgt" |
585
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
584
diff
changeset
|
14 |
|
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
584
diff
changeset
|
15 |
else |
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
584
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:
584
diff
changeset
|
17 |
fi |
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
584
diff
changeset
|
18 |
} |
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
584
diff
changeset
|
19 |
|
605 | 20 |
function copy { |
608 | 21 |
local out="$1" |
22 |
local src="$2" |
|
587
620f4594a09d
update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents:
586
diff
changeset
|
23 |
|
608 | 24 |
if check_update "$out" "$src"; then |
587
620f4594a09d
update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents:
586
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:
586
diff
changeset
|
26 |
|
608 | 27 |
do_update "$out" \ |
28 |
cat "$src" |
|
587
620f4594a09d
update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents:
586
diff
changeset
|
29 |
else |
620f4594a09d
update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents:
586
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:
586
diff
changeset
|
31 |
fi |
620f4594a09d
update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents:
586
diff
changeset
|
32 |
} |
585
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
584
diff
changeset
|
33 |
|
589
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
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:
587
diff
changeset
|
35 |
# |
605 | 36 |
# check $src $cmd $args... |
589
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
37 |
# |
605 | 38 |
function check { |
608 | 39 |
local src="$1"; shift |
40 |
local cmd="$1"; shift |
|
589
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
41 |
|
608 | 42 |
if cmd_test "$cmd" -q "$@"; then |
589
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
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:
587
diff
changeset
|
44 |
|
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
45 |
else |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
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:
587
diff
changeset
|
47 |
|
608 | 48 |
indent " " "$cmd" "$@" |
589
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
49 |
|
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
50 |
exit 1 |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
51 |
fi |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
52 |
} |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
53 |
|
605 | 54 |
## Generate forward zone from hosts hosts using pvl.hosts-dns: |
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
55 |
# |
607
77df429f63a3
update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents:
605
diff
changeset
|
56 |
# update_hosts_forward out/hosts/$hosts $hosts in/hosts/$hosts |
605 | 57 |
function update_hosts_forward { |
608 | 58 |
local out="$1"; shift |
59 |
local domain="$1"; shift |
|
615
639a5093039b
lib/update.operations: update_domain_forward/reverse: use --add-origin, unless hosts name does not include a .
Tero Marttila <terom@paivola.fi>
parents:
614
diff
changeset
|
60 |
|
616
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:
615
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:
615
diff
changeset
|
62 |
log_update "Generating forward hosts zone $out @ $domain <- $@..." |
605 | 63 |
|
608 | 64 |
do_update "$out" $OPT/bin/pvl.hosts-dns \ |
607
77df429f63a3
update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents:
605
diff
changeset
|
65 |
--hosts-charset=$CHARSET \ |
608 | 66 |
--forward-zone="$domain" \ |
616
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:
615
diff
changeset
|
67 |
"$@" |
605 | 68 |
else |
616
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:
615
diff
changeset
|
69 |
log_skip "Generating forward hosts $out <- $@: not changed" |
605 | 70 |
fi |
71 |
} |
|
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
72 |
|
605 | 73 |
function update_hosts_dhcp { |
607
77df429f63a3
update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents:
605
diff
changeset
|
74 |
local out=$1; shift |
77df429f63a3
update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents:
605
diff
changeset
|
75 |
local src=$1; shift |
605 | 76 |
|
607
77df429f63a3
update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents:
605
diff
changeset
|
77 |
if check_update $out $src "$@"; then |
605 | 78 |
log_update "Generating DHCP hosts $out <- $src..." |
79 |
||
607
77df429f63a3
update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents:
605
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:
605
diff
changeset
|
81 |
--hosts-charset=$CHARSET \ |
77df429f63a3
update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents:
605
diff
changeset
|
82 |
$src "$@" |
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
83 |
else |
605 | 84 |
log_skip "Generating DHCP hosts $out <- $src: not changed" |
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
85 |
fi |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
86 |
} |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
87 |
|
607
77df429f63a3
update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents:
605
diff
changeset
|
88 |
## Generate reverse zone from hosts hosts using pvl.hosts-dns: |
77df429f63a3
update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents:
605
diff
changeset
|
89 |
# |
77df429f63a3
update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents:
605
diff
changeset
|
90 |
# update_hosts_reverse out/hosts/$reverse $reverse in/hosts/$hosts |
77df429f63a3
update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents:
605
diff
changeset
|
91 |
function update_hosts_reverse { |
608 | 92 |
local out="$1"; shift |
93 |
local reverse="$1"; shift |
|
607
77df429f63a3
update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents:
605
diff
changeset
|
94 |
|
616
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:
615
diff
changeset
|
95 |
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:
615
diff
changeset
|
96 |
log_update "Generating reverse hosts zone $out <- $@..." |
607
77df429f63a3
update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents:
605
diff
changeset
|
97 |
|
608 | 98 |
do_update "$out" $OPT/bin/pvl.hosts-dns \ |
607
77df429f63a3
update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents:
605
diff
changeset
|
99 |
--hosts-charset=$CHARSET \ |
608 | 100 |
--reverse-zone="$reverse" \ |
616
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:
615
diff
changeset
|
101 |
"$@" |
607
77df429f63a3
update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents:
605
diff
changeset
|
102 |
else |
616
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:
615
diff
changeset
|
103 |
log_skip "Generating reverse hosts $out <- $@: not changed" |
607
77df429f63a3
update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents:
605
diff
changeset
|
104 |
fi |
77df429f63a3
update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents:
605
diff
changeset
|
105 |
} |
77df429f63a3
update: full host forward/dhcp/reverse zones
Tero Marttila <terom@paivola.fi>
parents:
605
diff
changeset
|
106 |
|
584
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:
583
diff
changeset
|
107 |
## 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:
583
diff
changeset
|
108 |
# |
618
a756f317d083
update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents:
617
diff
changeset
|
109 |
# do_update_serial .../serials/$zone $serial |
584
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:
583
diff
changeset
|
110 |
# |
22b58b938fd0
update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents:
583
diff
changeset
|
111 |
function do_update_serial { |
618
a756f317d083
update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents:
617
diff
changeset
|
112 |
local dst="$1" |
a756f317d083
update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents:
617
diff
changeset
|
113 |
local serial="$2" |
584
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:
583
diff
changeset
|
114 |
|
618
a756f317d083
update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents:
617
diff
changeset
|
115 |
echo $serial > $dst |
584
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:
583
diff
changeset
|
116 |
} |
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:
583
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:
583
diff
changeset
|
118 |
|
605 | 119 |
## Generate new serial for zone using pvl.dns-serial, if the zone data has changed: |
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
120 |
# |
618
a756f317d083
update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents:
617
diff
changeset
|
121 |
# update_serial .../serials/$zone $serial $deps... |
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
122 |
# |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
123 |
# Supports SERIAL_FORCE/NOOP. |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
124 |
# Updates $SERIALS/$zone.serial. |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
125 |
function update_serial { |
618
a756f317d083
update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents:
617
diff
changeset
|
126 |
local dst="$1"; shift |
608 | 127 |
local serial="$1"; shift |
618
a756f317d083
update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents:
617
diff
changeset
|
128 |
|
a756f317d083
update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents:
617
diff
changeset
|
129 |
local old=$(test -e "$dst" && cat "$dst" || echo '') |
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
130 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
131 |
# test |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
132 |
if [ $SERIAL_FORCE ]; then |
618
a756f317d083
update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents:
617
diff
changeset
|
133 |
log_force "Updating $dst: $old <- $serial: forced" |
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
134 |
|
618
a756f317d083
update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents:
617
diff
changeset
|
135 |
do_update_serial "$dst" "$serial" |
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
136 |
|
618
a756f317d083
update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents:
617
diff
changeset
|
137 |
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:
617
diff
changeset
|
138 |
log_skip "Updating $dst: $old <- $serial: not changed" |
575
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 |
elif [ $SERIAL_NOOP ]; then |
618
a756f317d083
update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents:
617
diff
changeset
|
141 |
log_noop "Updating $dst: $old <- $serial: skipped" |
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
142 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
143 |
else |
618
a756f317d083
update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents:
617
diff
changeset
|
144 |
log_update "Updating $dst: $old <- $serial" |
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
145 |
|
618
a756f317d083
update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents:
617
diff
changeset
|
146 |
do_update_serial "$dst" "$serial" |
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
147 |
fi |
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 |
|
608 | 150 |
## Generate zone file from source using pvl.dns-zone: |
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
151 |
# |
608 | 152 |
# update_zone out/zones/$zone in/zones/$zone var/serials/$zone |
153 |
function update_zone { |
|
618
a756f317d083
update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents:
617
diff
changeset
|
154 |
local out="$1"; shift |
a756f317d083
update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents:
617
diff
changeset
|
155 |
local src="$1"; shift |
a756f317d083
update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents:
617
diff
changeset
|
156 |
local serial="$1"; shift |
611
52d058780506
update_zone: handle noop'd serial
Tero Marttila <terom@paivola.fi>
parents:
608
diff
changeset
|
157 |
local serial_opt= |
52d058780506
update_zone: handle noop'd serial
Tero Marttila <terom@paivola.fi>
parents:
608
diff
changeset
|
158 |
|
52d058780506
update_zone: handle noop'd serial
Tero Marttila <terom@paivola.fi>
parents:
608
diff
changeset
|
159 |
if [ -n "$serial" -a -f "$serial" ]; then |
52d058780506
update_zone: handle noop'd serial
Tero Marttila <terom@paivola.fi>
parents:
608
diff
changeset
|
160 |
serial_opt="--serial=$(cat "$serial")" |
52d058780506
update_zone: handle noop'd serial
Tero Marttila <terom@paivola.fi>
parents:
608
diff
changeset
|
161 |
elif [ $SERIAL_NOOP ]; then |
52d058780506
update_zone: handle noop'd serial
Tero Marttila <terom@paivola.fi>
parents:
608
diff
changeset
|
162 |
warn "$out: noop'd serial, omitting" |
52d058780506
update_zone: handle noop'd serial
Tero Marttila <terom@paivola.fi>
parents:
608
diff
changeset
|
163 |
else |
52d058780506
update_zone: handle noop'd serial
Tero Marttila <terom@paivola.fi>
parents:
608
diff
changeset
|
164 |
fail "$out: missing serial: $serial" |
52d058780506
update_zone: handle noop'd serial
Tero Marttila <terom@paivola.fi>
parents:
608
diff
changeset
|
165 |
fi |
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
166 |
|
618
a756f317d083
update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents:
617
diff
changeset
|
167 |
if check_update "$out" "$src" "$serial" "$@"; then |
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
168 |
log_update "Generating $out <- $src..." |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
169 |
|
608 | 170 |
do_update "$out" $OPT/bin/pvl.dns-zone "$src" \ |
613
5b33ccac38ad
update_zone --include-path, log_check
Tero Marttila <terom@paivola.fi>
parents:
612
diff
changeset
|
171 |
--include-path=$SRV/var/zones \ |
611
52d058780506
update_zone: handle noop'd serial
Tero Marttila <terom@paivola.fi>
parents:
608
diff
changeset
|
172 |
$serial_opt |
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
173 |
else |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
174 |
log_skip "Generating $out <- $src: not changed" |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
175 |
fi |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
176 |
} |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
177 |
|
614
acb2fb235eb2
use new var/dhcp/hosts layout with update_dhcp_conf
Tero Marttila <terom@paivola.fi>
parents:
613
diff
changeset
|
178 |
## 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:
613
diff
changeset
|
179 |
function update_dhcp_conf { |
acb2fb235eb2
use new var/dhcp/hosts layout with update_dhcp_conf
Tero Marttila <terom@paivola.fi>
parents:
613
diff
changeset
|
180 |
local out="$1" |
acb2fb235eb2
use new var/dhcp/hosts layout with update_dhcp_conf
Tero Marttila <terom@paivola.fi>
parents:
613
diff
changeset
|
181 |
local src="$2" |
acb2fb235eb2
use new var/dhcp/hosts layout with update_dhcp_conf
Tero Marttila <terom@paivola.fi>
parents:
613
diff
changeset
|
182 |
|
acb2fb235eb2
use new var/dhcp/hosts layout with update_dhcp_conf
Tero Marttila <terom@paivola.fi>
parents:
613
diff
changeset
|
183 |
if check_update "$out" "$src"; then |
acb2fb235eb2
use new var/dhcp/hosts layout with update_dhcp_conf
Tero Marttila <terom@paivola.fi>
parents:
613
diff
changeset
|
184 |
log_update "Generating $out <- $src..." |
acb2fb235eb2
use new var/dhcp/hosts layout with update_dhcp_conf
Tero Marttila <terom@paivola.fi>
parents:
613
diff
changeset
|
185 |
|
acb2fb235eb2
use new var/dhcp/hosts layout with update_dhcp_conf
Tero Marttila <terom@paivola.fi>
parents:
613
diff
changeset
|
186 |
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:
613
diff
changeset
|
187 |
--include-path=$SRV/var/dhcp |
acb2fb235eb2
use new var/dhcp/hosts layout with update_dhcp_conf
Tero Marttila <terom@paivola.fi>
parents:
613
diff
changeset
|
188 |
else |
acb2fb235eb2
use new var/dhcp/hosts layout with update_dhcp_conf
Tero Marttila <terom@paivola.fi>
parents:
613
diff
changeset
|
189 |
log_skip "Generating $out <- $src: not changed" |
acb2fb235eb2
use new var/dhcp/hosts layout with update_dhcp_conf
Tero Marttila <terom@paivola.fi>
parents:
613
diff
changeset
|
190 |
fi |
acb2fb235eb2
use new var/dhcp/hosts layout with update_dhcp_conf
Tero Marttila <terom@paivola.fi>
parents:
613
diff
changeset
|
191 |
} |
acb2fb235eb2
use new var/dhcp/hosts layout with update_dhcp_conf
Tero Marttila <terom@paivola.fi>
parents:
613
diff
changeset
|
192 |
|
605 | 193 |
## Test hosts zone for validity using pvl.hosts-check: |
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
194 |
# |
605 | 195 |
# check_hosts .../hosts |
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
196 |
function check_hosts { |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
197 |
local hosts=$1; shift 1 |
605 | 198 |
|
199 |
# TODO |
|
200 |
check $hosts \ |
|
201 |
$OPT/bin/pvl.hosts-check $hosts |
|
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
202 |
} |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
203 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
204 |
## 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
|
205 |
# |
605 | 206 |
# check_zone ..../$zone $origin |
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
207 |
function check_zone { |
605 | 208 |
local zone=$1 |
209 |
local origin=$2 |
|
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
210 |
|
613
5b33ccac38ad
update_zone --include-path, log_check
Tero Marttila <terom@paivola.fi>
parents:
612
diff
changeset
|
211 |
log_check "Checking $zone @ $origin..." |
5b33ccac38ad
update_zone --include-path, log_check
Tero Marttila <terom@paivola.fi>
parents:
612
diff
changeset
|
212 |
|
605 | 213 |
# checkzone is very specific about the order of arguments, -q must be first |
214 |
check $zone $NAMED_CHECKZONE $origin $zone |
|
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
215 |
} |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
216 |
|
585
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
584
diff
changeset
|
217 |
## Test DHCP configuration for validity using dhcpd -t: |
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
584
diff
changeset
|
218 |
# |
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
584
diff
changeset
|
219 |
# check_dhcp [$conf] |
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
584
diff
changeset
|
220 |
# |
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
584
diff
changeset
|
221 |
# Defaults to the global $DHCPD_CONF. |
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
584
diff
changeset
|
222 |
# Fails if the check fails. |
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
584
diff
changeset
|
223 |
function check_dhcp { |
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
584
diff
changeset
|
224 |
local conf=${1:-$DHCPD_CONF} |
613
5b33ccac38ad
update_zone --include-path, log_check
Tero Marttila <terom@paivola.fi>
parents:
612
diff
changeset
|
225 |
|
5b33ccac38ad
update_zone --include-path, log_check
Tero Marttila <terom@paivola.fi>
parents:
612
diff
changeset
|
226 |
log_check "Checking DHCP $conf..." |
585
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
584
diff
changeset
|
227 |
|
591
5a0335960591
update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents:
589
diff
changeset
|
228 |
if [ ! -e $DHCPD ]; then |
5a0335960591
update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents:
589
diff
changeset
|
229 |
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:
589
diff
changeset
|
230 |
return 0 |
5a0335960591
update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents:
589
diff
changeset
|
231 |
fi |
5a0335960591
update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents:
589
diff
changeset
|
232 |
|
605 | 233 |
check $conf \ |
589
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
234 |
$DHCPD -cf $conf -t |
585
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
584
diff
changeset
|
235 |
} |
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
584
diff
changeset
|
236 |
|
586
a88766722d18
update: rename dhcp hosts -> dhcp conf, makes more sense; check input files before linking
Tero Marttila <terom@paivola.fi>
parents:
585
diff
changeset
|
237 |
## Test DHCP configuration of given settings/dhcp using check_dhcp $DHCP_DATA/$host.conf: |
585
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
584
diff
changeset
|
238 |
# |
586
a88766722d18
update: rename dhcp hosts -> dhcp conf, makes more sense; check input files before linking
Tero Marttila <terom@paivola.fi>
parents:
585
diff
changeset
|
239 |
# 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:
585
diff
changeset
|
240 |
# |
a88766722d18
update: rename dhcp hosts -> dhcp conf, makes more sense; check input files before linking
Tero Marttila <terom@paivola.fi>
parents:
585
diff
changeset
|
241 |
function check_dhcp_conf { |
589
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
242 |
local conf=$1; |
585
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
584
diff
changeset
|
243 |
|
586
a88766722d18
update: rename dhcp hosts -> dhcp conf, makes more sense; check input files before linking
Tero Marttila <terom@paivola.fi>
parents:
585
diff
changeset
|
244 |
check_dhcp $DHCP_DATA/$conf.conf |
585
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
584
diff
changeset
|
245 |
} |
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
584
diff
changeset
|
246 |
|
605 | 247 |
### Deploy |
617
1b02d8075676
cleanup main update script somewhat
Tero Marttila <terom@paivola.fi>
parents:
616
diff
changeset
|
248 |
# set by do_reload_zone if zone data has actually been reloaded |
1b02d8075676
cleanup main update script somewhat
Tero Marttila <terom@paivola.fi>
parents:
616
diff
changeset
|
249 |
RELOAD_ZONES= |
1b02d8075676
cleanup main update script somewhat
Tero Marttila <terom@paivola.fi>
parents:
616
diff
changeset
|
250 |
|
605 | 251 |
## Run rndc reload |
589
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
252 |
function do_reload_zones { |
582
b0c761c4d5f8
update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents:
580
diff
changeset
|
253 |
# run |
b0c761c4d5f8
update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents:
580
diff
changeset
|
254 |
indent " rndc: " \ |
b0c761c4d5f8
update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents:
580
diff
changeset
|
255 |
$RNDC reload |
589
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
256 |
|
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
257 |
# set flag |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
258 |
RELOAD_ZONES=y |
582
b0c761c4d5f8
update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents:
580
diff
changeset
|
259 |
} |
b0c761c4d5f8
update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents:
580
diff
changeset
|
260 |
|
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
261 |
## Load update zonefiles into bind: |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
262 |
# |
584
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:
583
diff
changeset
|
263 |
# reload_zones |
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
264 |
# |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
265 |
# Invokes `rndc reload`, showing its output. |
584
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:
583
diff
changeset
|
266 |
function reload_zones { |
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
267 |
local msg="Reload zones" |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
268 |
|
584
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:
583
diff
changeset
|
269 |
if [ $RELOAD_FORCE ]; then |
582
b0c761c4d5f8
update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents:
580
diff
changeset
|
270 |
log_force "$msg..." |
b0c761c4d5f8
update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents:
580
diff
changeset
|
271 |
|
589
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
272 |
do_reload_zones |
582
b0c761c4d5f8
update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents:
580
diff
changeset
|
273 |
|
584
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:
583
diff
changeset
|
274 |
elif [ $RELOAD_NOOP ]; then |
582
b0c761c4d5f8
update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents:
580
diff
changeset
|
275 |
log_noop "$msg: skipped" |
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
276 |
|
591
5a0335960591
update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents:
589
diff
changeset
|
277 |
elif [ ! -e $RNDC ]; then |
5a0335960591
update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents:
589
diff
changeset
|
278 |
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:
589
diff
changeset
|
279 |
|
5a0335960591
update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents:
589
diff
changeset
|
280 |
elif [ ! -e $RNDC_KEY ]; then |
5a0335960591
update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents:
589
diff
changeset
|
281 |
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:
589
diff
changeset
|
282 |
|
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
283 |
elif [ ! -r $RNDC_KEY ]; then |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
284 |
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
|
285 |
|
582
b0c761c4d5f8
update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents:
580
diff
changeset
|
286 |
return 1 |
b0c761c4d5f8
update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents:
580
diff
changeset
|
287 |
|
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
288 |
else |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
289 |
log_update "$msg..." |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
290 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
291 |
# run |
589
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
292 |
do_reload_zones |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
293 |
fi |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
294 |
} |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
295 |
|
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
296 |
## 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:
587
diff
changeset
|
297 |
# |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
298 |
# do_reload_dhcp |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
299 |
# |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
300 |
# 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:
587
diff
changeset
|
301 |
function do_reload_dhcp { |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
302 |
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:
587
diff
changeset
|
303 |
cmd $DHCPD_INIT restart |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
304 |
else |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
305 |
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:
587
diff
changeset
|
306 |
fi |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
307 |
} |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
308 |
|
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
309 |
## Reload dhcp hosts |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
310 |
# |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
311 |
# reload_dhcp |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
312 |
# |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
313 |
# 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:
587
diff
changeset
|
314 |
function reload_dhcp { |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
315 |
local msg="Reload DHCP hosts" |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
316 |
|
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
317 |
if [ $RELOAD_FORCE ]; then |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
318 |
log_force "$msg..." |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
319 |
|
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
320 |
do_reload_dhcp |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
321 |
|
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
322 |
elif [ $RELOAD_NOOP ]; then |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
323 |
log_noop "$msg: skipped" |
591
5a0335960591
update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents:
589
diff
changeset
|
324 |
|
5a0335960591
update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents:
589
diff
changeset
|
325 |
elif [ ! -e $DHCPD ]; then |
5a0335960591
update: check_dhcp + reload_dhcp/zones: handle dhcpd/rndc not installed
Tero Marttila <terom@paivola.fi>
parents:
589
diff
changeset
|
326 |
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:
589
diff
changeset
|
327 |
|
589
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
328 |
else |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
329 |
log_update "$msg..." |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
330 |
|
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
331 |
# run |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
587
diff
changeset
|
332 |
do_reload_dhcp |
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
333 |
fi |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
334 |
} |
584
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:
583
diff
changeset
|
335 |
|
605 | 336 |
### Commit |
337 |
## Commit changes to version control: |
|
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
338 |
# |
619
bed4765fc56f
fix hg commit message argument passing
Tero Marttila <terom@paivola.fi>
parents:
618
diff
changeset
|
339 |
# update_commit .../etc "commit message" |
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
340 |
# |
605 | 341 |
# Invokes `hg commit`, first showing the diff. |
618
a756f317d083
update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents:
617
diff
changeset
|
342 |
function update_commit { |
619
bed4765fc56f
fix hg commit message argument passing
Tero Marttila <terom@paivola.fi>
parents:
618
diff
changeset
|
343 |
local repo="$1" |
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
344 |
local commit_msg="$COMMIT_MSG" |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
345 |
|
605 | 346 |
local msg="Commit changes" |
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
347 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
348 |
# operate? |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
349 |
if [ $COMMIT_FORCE ]; then |
618
a756f317d083
update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents:
617
diff
changeset
|
350 |
log_force "$msg: $commit_msg" |
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
351 |
|
619
bed4765fc56f
fix hg commit message argument passing
Tero Marttila <terom@paivola.fi>
parents:
618
diff
changeset
|
352 |
[ $LOG_DIFF ] && indent " " hg_diff $repo |
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
353 |
|
619
bed4765fc56f
fix hg commit message argument passing
Tero Marttila <terom@paivola.fi>
parents:
618
diff
changeset
|
354 |
hg_commit "$repo" "$commit_msg" |
bed4765fc56f
fix hg commit message argument passing
Tero Marttila <terom@paivola.fi>
parents:
618
diff
changeset
|
355 |
|
bed4765fc56f
fix hg commit message argument passing
Tero Marttila <terom@paivola.fi>
parents:
618
diff
changeset
|
356 |
elif ! hg_modified "$repo"; then |
612
51270237a6ff
cleanup update, reintroduce separate hg repo
Tero Marttila <terom@paivola.fi>
parents:
611
diff
changeset
|
357 |
log_warn "$msg: no changes" |
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
358 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
359 |
elif [ $COMMIT_SKIP ]; then |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
360 |
log_noop "$msg: skipped" |
580
d83a5e9be193
update: use hg diff --stat for .serials
Tero Marttila <terom@paivola.fi>
parents:
575
diff
changeset
|
361 |
|
d83a5e9be193
update: use hg diff --stat for .serials
Tero Marttila <terom@paivola.fi>
parents:
575
diff
changeset
|
362 |
# still show diff, though |
619
bed4765fc56f
fix hg commit message argument passing
Tero Marttila <terom@paivola.fi>
parents:
618
diff
changeset
|
363 |
[ $LOG_DIFF ] && indent " " hg_diff "$repo" |
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
364 |
else |
618
a756f317d083
update: commit before update, and use the hg commit timestamp as the serial
Tero Marttila <terom@paivola.fi>
parents:
617
diff
changeset
|
365 |
log_update "$msg: $commit_msg" |
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
366 |
|
619
bed4765fc56f
fix hg commit message argument passing
Tero Marttila <terom@paivola.fi>
parents:
618
diff
changeset
|
367 |
[ $LOG_DIFF ] && indent " " hg_diff $repo |
bed4765fc56f
fix hg commit message argument passing
Tero Marttila <terom@paivola.fi>
parents:
618
diff
changeset
|
368 |
|
bed4765fc56f
fix hg commit message argument passing
Tero Marttila <terom@paivola.fi>
parents:
618
diff
changeset
|
369 |
hg_commit "$repo" "$commit_msg" |
575
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
370 |
fi |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
371 |
} |