author | Tero Marttila <terom@paivola.fi> |
Wed, 21 Mar 2012 16:45:59 +0200 | |
changeset 61 | 22b58b938fd0 |
parent 60 | b65ce9123039 |
child 62 | 65bf391fd2f3 |
permissions | -rw-r--r-- |
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 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
6 |
## Hosts |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
7 |
## Update hosts from verbatim from input zone data: |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
8 |
# |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
9 |
# copy_hosts $ZONES/$zone $DATA/$base |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
10 |
# |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
11 |
# Writes updated zone to $zone, deps on $base. |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
12 |
function copy_hosts { |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
13 |
local zone=$1 |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
14 |
local base=$2 |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
15 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
16 |
if check_update $zone $base; then |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
17 |
log_update "Copying hosts $zone <- $base..." |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
18 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
19 |
do_update $zone \ |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
20 |
cat $ROOT/$base |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
21 |
else |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
22 |
log_skip "Copying hosts $zone <- $base: not changed" |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
23 |
fi |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
24 |
} |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
25 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
26 |
## Generate hosts from input zone data using $BIN/process-zone: |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
27 |
# |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
28 |
# update_hosts $ZONES/$zone $DATA/$base |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
29 |
# |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
30 |
# Writes process-zone'd data to $zone, deps on $base. |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
31 |
function update_hosts { |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
32 |
local zone=$1; shift |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
33 |
local base=$1; shift |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
34 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
35 |
if check_update $zone $base; then |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
36 |
log_update "Generating hosts $zone <- $base..." |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
37 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
38 |
do_update $zone \ |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
39 |
$BIN/process-zone $PROCESS_ARGS $ROOT/$base "$@" |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
40 |
else |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
41 |
log_skip "Generating hosts $zone <- $base: not changed" |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
42 |
fi |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
43 |
} |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
44 |
|
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
|
45 |
## 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
|
46 |
# |
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
|
47 |
# do_update_serial $serial |
22b58b938fd0
update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents:
60
diff
changeset
|
48 |
# |
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
|
49 |
# Shows old/new serial on debug. |
22b58b938fd0
update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents:
60
diff
changeset
|
50 |
function do_update_serial { |
22b58b938fd0
update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents:
60
diff
changeset
|
51 |
local serial=$1 |
22b58b938fd0
update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents:
60
diff
changeset
|
52 |
|
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
|
53 |
# read |
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
|
54 |
local old=$(test -e $ROOT/$serial && cat $ROOT/$serial || echo '') |
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
|
55 |
|
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
|
56 |
|
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
|
57 |
cmd $BIN/update-serial $ROOT/$serial |
22b58b938fd0
update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents:
60
diff
changeset
|
58 |
|
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
|
59 |
# read |
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
|
60 |
local new=$(cat $ROOT/$serial) |
22b58b938fd0
update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents:
60
diff
changeset
|
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
|
62 |
debug " $old -> $new" |
22b58b938fd0
update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents:
60
diff
changeset
|
63 |
} |
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
|
64 |
|
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
|
65 |
|
52
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
66 |
## Generate new serial for zone using $BIN/update-serial, if the zone data has changed: |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
67 |
# |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
68 |
# update_serial $zone $deps... |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
69 |
# |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
70 |
# Supports SERIAL_FORCE/NOOP. |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
71 |
# Updates $SERIALS/$zone.serial. |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
72 |
function update_serial { |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
73 |
local zone=$1; shift |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
74 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
75 |
local serial=$SERIALS/$zone.serial |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
76 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
77 |
# test |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
78 |
if [ $SERIAL_FORCE ]; then |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
79 |
log_force "Updating $serial: forced" |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
80 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
81 |
do_update_serial $serial |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
82 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
83 |
elif ! check_update $serial "$@"; then |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
84 |
log_skip "Updating $serial: not changed" |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
85 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
86 |
elif [ $SERIAL_NOOP ]; then |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
87 |
log_noop "Updating $serial: skipped" |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
88 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
89 |
else |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
90 |
log_update "Updating $serial..." |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
91 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
92 |
do_update_serial $serial |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
93 |
fi |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
94 |
} |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
95 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
96 |
## Link serial for zone from given base-zone: |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
97 |
# |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
98 |
# link_serial $zone $base |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
99 |
function link_serial { |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
100 |
local zone=$1 |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
101 |
local base=$2 |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
102 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
103 |
local lnk=$SERIALS/$zone.serial |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
104 |
local tgt=$SERIALS/$base.serial |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
105 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
106 |
if check_link $lnk $tgt; then |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
107 |
log_update "Linking $lnk -> $tgt..." |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
108 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
109 |
do_link $lnk $tgt |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
110 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
111 |
else |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
112 |
log_skip "Linking $lnk -> $tgt: not changed" |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
113 |
fi |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
114 |
} |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
115 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
116 |
## Update zone file verbatim from source: |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
117 |
# |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
118 |
# copy_zone $view $zone [$base] |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
119 |
# |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
120 |
# Copies changed $DATA/$base zone data to $ZONES/$view/$zone. |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
121 |
function copy_zone { |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
122 |
local view=$1 |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
123 |
local zone=$2 |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
124 |
local base=${3:-$zone} |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
125 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
126 |
local out=$ZONES/$view/$zone |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
127 |
local src=$DATA/$base |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
128 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
129 |
if check_update $out $src; then |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
130 |
log_update "Copying $out <- $src..." |
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 |
do_update $out \ |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
133 |
cat $ROOT/$src |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
134 |
else |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
135 |
log_skip "Copying $out <- $src: not changed" |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
136 |
fi |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
137 |
} |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
138 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
139 |
## Expand zone file from source using $BIN/expand-zone: |
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 |
# update_zone $view $zone [$base] |
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 |
# Processed $DATA/$base zone data through $BIN/expand-zone, writing output to $ZONES/$view/$zone. |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
144 |
function update_zone { |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
145 |
local view=$1 |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
146 |
local zone=$2 |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
147 |
local base=${3:-$zone} |
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 |
local out=$ZONES/$view/$zone |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
150 |
local src=$DATA/$base.zone |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
151 |
local lnk=$ZONES/$base |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
152 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
153 |
local serial=$SERIALS/$base.serial |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
154 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
155 |
if check_update $out $src $serial; then |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
156 |
log_update "Generating $out <- $src..." |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
157 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
158 |
do_update $out \ |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
159 |
$BIN/expand-zone $ROOT/$src \ |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
160 |
--serial $ROOT/$serial \ |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
161 |
--expand zones=$(abspath $ZONES) \ |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
162 |
--expand view=$view |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
163 |
else |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
164 |
log_skip "Generating $out <- $src: not changed" |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
165 |
fi |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
166 |
} |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
167 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
168 |
## Link zone file to ues given shared zone. |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
169 |
# |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
170 |
# link_zone $view $zone [$base] |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
171 |
# |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
172 |
# Looks for shared zone at: |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
173 |
# $ZONES/$view/$base |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
174 |
# $ZONES/common/$base |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
175 |
function link_zone { |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
176 |
local view=$1 |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
177 |
local zone=$2 |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
178 |
local base=${3:-$zone} |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
179 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
180 |
local out=$ZONES/$view/$zone |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
181 |
local tgt=$(choose_link $out $ZONES/$view/$base $ZONES/common/$base) |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
182 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
183 |
if check_link $out $tgt; then |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
184 |
log_update "Linking $out -> $tgt..." |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
185 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
186 |
do_link $out $tgt |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
187 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
188 |
else |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
189 |
log_skip "Linking $out -> $tgt: not changed" |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
190 |
fi |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
191 |
} |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
192 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
193 |
## Test hosts zone for validity: |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
194 |
# |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
195 |
# check_hosts $DATA/$hosts --check-exempt ... |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
196 |
# |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
197 |
# Fails if the check fails. |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
198 |
function check_hosts { |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
199 |
local hosts=$1; shift 1 |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
200 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
201 |
local cmd=($BIN/process-zone $PROCESS_ARGS $ROOT/$hosts --check-hosts "$@") |
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 |
if "${cmd[@]}" -q; then |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
204 |
log_skip "Check $hosts: OK" |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
205 |
else |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
206 |
log_error " Check $hosts: Failed" |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
207 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
208 |
indent " " "${cmd[@]}" |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
209 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
210 |
exit 1 |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
211 |
fi |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
212 |
} |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
213 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
214 |
## Test zone file for validity using named-checkzone: |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
215 |
# |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
216 |
# check_zone $view $zone $origin |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
217 |
# |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
218 |
# Uses the zonefile at $ZONES/$view/$zone, loading it with given initial $ORIGIN. |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
219 |
# Fails if the check fails. |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
220 |
function check_zone { |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
221 |
local view=$1 |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
222 |
local zone=$2 |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
223 |
local origin=$3 |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
224 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
225 |
local src=$ZONES/$view/$zone |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
226 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
227 |
local cmd=($NAMED_CHECKZONE $origin $ROOT/$src) |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
228 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
229 |
# test |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
230 |
# XXX: checkzone is very specific about the order of arguments, -q must be first |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
231 |
if $NAMED_CHECKZONE -q $origin $ROOT/$src; then |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
232 |
log_skip "Check $src ($origin): OK" |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
233 |
else |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
234 |
log_error " Check $src ($origin): Failed:" |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
235 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
236 |
indent " " "${cmd[@]}" |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
237 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
238 |
exit 1 |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
239 |
fi |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
240 |
} |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
241 |
|
59
b0c761c4d5f8
update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents:
57
diff
changeset
|
242 |
# Run rndc reload |
b0c761c4d5f8
update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents:
57
diff
changeset
|
243 |
function do_reload { |
b0c761c4d5f8
update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents:
57
diff
changeset
|
244 |
# run |
b0c761c4d5f8
update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents:
57
diff
changeset
|
245 |
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
|
246 |
$RNDC reload |
b0c761c4d5f8
update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents:
57
diff
changeset
|
247 |
} |
b0c761c4d5f8
update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents:
57
diff
changeset
|
248 |
|
52
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
249 |
## Load update zonefiles into bind: |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
250 |
# |
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
|
251 |
# reload_zones |
52
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
252 |
# |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
253 |
# 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
|
254 |
function reload_zones { |
52
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
255 |
local msg="Reload zones" |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
256 |
|
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
|
257 |
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
|
258 |
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
|
259 |
|
b0c761c4d5f8
update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents:
57
diff
changeset
|
260 |
do_reload |
b0c761c4d5f8
update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents:
57
diff
changeset
|
261 |
|
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
|
262 |
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
|
263 |
log_noop "$msg: skipped" |
52
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 |
elif [ ! -r $RNDC_KEY ]; then |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
266 |
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
|
267 |
|
59
b0c761c4d5f8
update: DEPLOY_FORCE/SKIP (-r/-R), make rndc key error an actual error
Tero Marttila <terom@paivola.fi>
parents:
57
diff
changeset
|
268 |
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
|
269 |
|
52
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
270 |
else |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
271 |
log_update "$msg..." |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
272 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
273 |
# run |
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 |
do_reload |
52
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
275 |
fi |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
276 |
} |
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
|
277 |
|
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
|
278 |
## Perform `hg commit` for $DATA |
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
|
279 |
function do_commit { |
22b58b938fd0
update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents:
60
diff
changeset
|
280 |
local msg=$1 |
22b58b938fd0
update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents:
60
diff
changeset
|
281 |
|
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
|
282 |
[ $LOG_DIFF ] && indent " " hg_diff |
22b58b938fd0
update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents:
60
diff
changeset
|
283 |
|
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
|
284 |
hg_commit "$msg" |
22b58b938fd0
update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents:
60
diff
changeset
|
285 |
} |
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
|
286 |
|
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
|
287 |
|
52
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
288 |
## Commit changes in $DATA to version control: |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
289 |
# |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
290 |
# commit_data |
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 |
# Invokes `hg commit` in the $REPO, first showing the diff. |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
293 |
function commit_data { |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
294 |
local repo=$REPO |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
295 |
local commit_msg="$COMMIT_MSG" |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
296 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
297 |
local msg="Commit changes in $repo" |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
298 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
299 |
# operate? |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
300 |
if [ $COMMIT_FORCE ]; then |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
301 |
log_force "$msg..." |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
302 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
303 |
do_commit "$commit_msg" |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
304 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
305 |
elif ! hg_modified; then |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
306 |
log_skip "$msg: no changes" |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
307 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
308 |
elif [ $COMMIT_SKIP ]; then |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
309 |
log_noop "$msg: skipped" |
57
d83a5e9be193
update: use hg diff --stat for .serials
Tero Marttila <terom@paivola.fi>
parents:
52
diff
changeset
|
310 |
|
d83a5e9be193
update: use hg diff --stat for .serials
Tero Marttila <terom@paivola.fi>
parents:
52
diff
changeset
|
311 |
# still show diff, though |
d83a5e9be193
update: use hg diff --stat for .serials
Tero Marttila <terom@paivola.fi>
parents:
52
diff
changeset
|
312 |
[ $LOG_DIFF ] && indent " " hg_diff |
52
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
313 |
else |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
314 |
log_update "$msg..." |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
315 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
316 |
do_commit "$commit_msg" |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
317 |
fi |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
318 |
} |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
319 |