author | Tero Marttila <terom@paivola.fi> |
Tue, 20 Mar 2012 12:19:16 +0200 | |
changeset 41 | baae373b787e |
parent 40 | d99ebc15833d |
child 42 | ef5bcc4145de |
permissions | -rwxr-xr-x |
2 | 1 |
#!/bin/bash |
2 |
# vim: set ft=sh : |
|
3 |
||
4 |
set -ue |
|
5 |
||
6 |
ROOT=$(pwd) |
|
7 |
||
28
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
8 |
# resolve $0 |
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
9 |
self=$0 |
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
10 |
while [ -L $self ]; do |
31
2b7aad3466c6
update: log_warn, -q; ensure_dir; link_zone paivola-reverse; indent error exit
Tero Marttila <terom@paivola.fi>
parents:
30
diff
changeset
|
11 |
tgt=$(readlink $self) |
2b7aad3466c6
update: log_warn, -q; ensure_dir; link_zone paivola-reverse; indent error exit
Tero Marttila <terom@paivola.fi>
parents:
30
diff
changeset
|
12 |
|
2b7aad3466c6
update: log_warn, -q; ensure_dir; link_zone paivola-reverse; indent error exit
Tero Marttila <terom@paivola.fi>
parents:
30
diff
changeset
|
13 |
if [ "${tgt:0:1}" == "/" ]; then |
2b7aad3466c6
update: log_warn, -q; ensure_dir; link_zone paivola-reverse; indent error exit
Tero Marttila <terom@paivola.fi>
parents:
30
diff
changeset
|
14 |
self=$tgt |
2b7aad3466c6
update: log_warn, -q; ensure_dir; link_zone paivola-reverse; indent error exit
Tero Marttila <terom@paivola.fi>
parents:
30
diff
changeset
|
15 |
else |
2b7aad3466c6
update: log_warn, -q; ensure_dir; link_zone paivola-reverse; indent error exit
Tero Marttila <terom@paivola.fi>
parents:
30
diff
changeset
|
16 |
self=$(dirname $self)/$tgt |
2b7aad3466c6
update: log_warn, -q; ensure_dir; link_zone paivola-reverse; indent error exit
Tero Marttila <terom@paivola.fi>
parents:
30
diff
changeset
|
17 |
fi |
28
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
18 |
done |
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
19 |
|
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
20 |
# bin dir |
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
21 |
BIN=$(dirname $self) |
2 | 22 |
|
28
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
23 |
# data files |
21 | 24 |
DATA=settings |
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
25 |
ZONES=zones |
21 | 26 |
SERIALS=$DATA |
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
27 |
REPO= |
2 | 28 |
|
28
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
29 |
# data args |
2 | 30 |
PROCESS_ARGS='--input-charset latin-1' |
31 |
||
32 |
FORWARD_MX=mail |
|
33 |
REVERSE_ZONE=194.197.235 |
|
34 |
REVERSE_DOMAIN=paivola.fi |
|
35 |
||
28
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
36 |
# external progs |
10 | 37 |
NAMED_CHECKZONE=/usr/sbin/named-checkzone |
31
2b7aad3466c6
update: log_warn, -q; ensure_dir; link_zone paivola-reverse; indent error exit
Tero Marttila <terom@paivola.fi>
parents:
30
diff
changeset
|
38 |
HG=/usr/bin/hg |
27 | 39 |
RNDC=/usr/sbin/rndc |
10 | 40 |
|
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
41 |
## options |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
42 |
IS_TTY= |
8 | 43 |
|
31
2b7aad3466c6
update: log_warn, -q; ensure_dir; link_zone paivola-reverse; indent error exit
Tero Marttila <terom@paivola.fi>
parents:
30
diff
changeset
|
44 |
LOG_WARN=y |
8 | 45 |
LOG=y |
41
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
46 |
LOG_INFO=y |
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
47 |
LOG_SKIP= |
8 | 48 |
LOG_DEBUG= |
49 |
LOG_CMD= |
|
50 |
||
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
51 |
UPDATE_FORCE= |
8 | 52 |
UPDATE_NOOP= |
53 |
UPDATE_DIFF= |
|
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
54 |
SERIAL_NOUPDATE= |
21 | 55 |
COMMIT_SKIP= |
56 |
COMMIT_FORCE= |
|
22 | 57 |
COMMIT_MSG=' ' |
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
58 |
|
27 | 59 |
DEPLOY_SKIP= |
60 |
||
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
61 |
function help_args { |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
62 |
local prog=$1 |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
63 |
|
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
64 |
cat <<END |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
65 |
Usage: $prog [options] |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
66 |
|
15 | 67 |
General: |
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
68 |
-h display this help text |
28
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
69 |
-d DIR datadir |
8 | 70 |
|
15 | 71 |
Logging: |
8 | 72 |
-q quiet |
73 |
-v verbose |
|
74 |
-D debug |
|
21 | 75 |
-V debug commands |
8 | 76 |
|
15 | 77 |
Updates: |
9 | 78 |
-p show changes |
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
79 |
-F force-updates without checking src mtime |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
80 |
-S do not update serial |
21 | 81 |
-n no-op/mock-update; don't actually change anything; implies -SpC |
82 |
||
83 |
Commit |
|
84 |
-C do not commit changes |
|
85 |
-c commit changes |
|
28
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
86 |
-m MSG commit message |
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
87 |
END |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
88 |
} |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
89 |
|
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
90 |
function parse_args { |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
91 |
OPTIND=1 |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
92 |
|
28
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
93 |
while getopts 'hd:qvDVpFSnCcm:' opt "$@"; do |
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
94 |
case $opt in |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
95 |
h) |
15 | 96 |
help_args $0 |
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
97 |
exit 0 |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
98 |
;; |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
99 |
|
28
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
100 |
d) ROOT="$OPTARG" ;; |
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
101 |
|
31
2b7aad3466c6
update: log_warn, -q; ensure_dir; link_zone paivola-reverse; indent error exit
Tero Marttila <terom@paivola.fi>
parents:
30
diff
changeset
|
102 |
q) |
2b7aad3466c6
update: log_warn, -q; ensure_dir; link_zone paivola-reverse; indent error exit
Tero Marttila <terom@paivola.fi>
parents:
30
diff
changeset
|
103 |
LOG= |
2b7aad3466c6
update: log_warn, -q; ensure_dir; link_zone paivola-reverse; indent error exit
Tero Marttila <terom@paivola.fi>
parents:
30
diff
changeset
|
104 |
LOG_WARN= |
2b7aad3466c6
update: log_warn, -q; ensure_dir; link_zone paivola-reverse; indent error exit
Tero Marttila <terom@paivola.fi>
parents:
30
diff
changeset
|
105 |
;; |
2b7aad3466c6
update: log_warn, -q; ensure_dir; link_zone paivola-reverse; indent error exit
Tero Marttila <terom@paivola.fi>
parents:
30
diff
changeset
|
106 |
|
41
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
107 |
v) LOG_SKIP=y ;; |
16 | 108 |
D) |
109 |
LOG_DEBUG=y |
|
110 |
LOG_INFO=y |
|
111 |
;; |
|
21 | 112 |
V) LOG_CMD=y ;; |
113 |
||
9 | 114 |
p) UPDATE_DIFF=y ;; |
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
115 |
F) UPDATE_FORCE=y ;; |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
116 |
S) SERIAL_NOUPDATE=y ;; |
8 | 117 |
|
118 |
n) |
|
119 |
UPDATE_NOOP=y |
|
9 | 120 |
# implies -Sp |
121 |
UPDATE_DIFF=y |
|
8 | 122 |
SERIAL_NOUPDATE=y |
21 | 123 |
COMMIT_SKIP=y |
27 | 124 |
DEPLOY_SKIP=y |
8 | 125 |
;; |
126 |
||
21 | 127 |
C) COMMIT_SKIP=y ;; |
128 |
c) COMMIT_FORCE=y ;; |
|
129 |
m) COMMIT_MSG="$OPTARG" ;; |
|
8 | 130 |
|
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
131 |
?) |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
132 |
die |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
133 |
;; |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
134 |
esac |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
135 |
|
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
136 |
done |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
137 |
} |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
138 |
|
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
139 |
## lib |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
140 |
function log_msg { |
2 | 141 |
echo "$*" >&2 |
142 |
} |
|
143 |
||
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
144 |
function log_color { |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
145 |
local code=$1; shift |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
146 |
|
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
147 |
if [ $IS_TTY ]; then |
41
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
148 |
echo $'\e['${code}'m'"$*"$'\e[00m' >&2 |
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
149 |
else |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
150 |
echo "$*" >&2 |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
151 |
fi |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
152 |
} |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
153 |
|
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
154 |
function log_error { |
41
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
155 |
log_color '31' "$*" |
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
156 |
} |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
157 |
|
31
2b7aad3466c6
update: log_warn, -q; ensure_dir; link_zone paivola-reverse; indent error exit
Tero Marttila <terom@paivola.fi>
parents:
30
diff
changeset
|
158 |
function log_warn { |
41
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
159 |
[ $LOG_WARN ] && log_color '33' "$*" || true |
31
2b7aad3466c6
update: log_warn, -q; ensure_dir; link_zone paivola-reverse; indent error exit
Tero Marttila <terom@paivola.fi>
parents:
30
diff
changeset
|
160 |
} |
2b7aad3466c6
update: log_warn, -q; ensure_dir; link_zone paivola-reverse; indent error exit
Tero Marttila <terom@paivola.fi>
parents:
30
diff
changeset
|
161 |
|
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
162 |
function log { |
8 | 163 |
[ $LOG ] && log_msg "$*" || true |
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
164 |
} |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
165 |
|
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
166 |
function log_info { |
41
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
167 |
[ $LOG_INFO ] && log_color '36' " $*" || true |
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
168 |
} |
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
169 |
|
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
170 |
function log_skip { |
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
171 |
[ $LOG_SKIP ] && log_color '1;34' " $*" || true |
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
172 |
} |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
173 |
|
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
174 |
function log_debug { |
8 | 175 |
[ $LOG_DEBUG ] && log_color 32 " $*" || true |
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
176 |
} |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
177 |
|
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
178 |
function log_cmd { |
8 | 179 |
[ $LOG_CMD ] && log_color 35 " \$ $*" || true |
180 |
} |
|
181 |
||
182 |
# XXX: broken |
|
183 |
function log_stack { |
|
184 |
local level=1 |
|
185 |
||
186 |
while info=$(caller $level); do |
|
187 |
echo $info | read line sub file |
|
188 |
||
189 |
log_msg "$file:$lineno $sub()" |
|
190 |
||
191 |
level=$(($level + 1)) |
|
192 |
done |
|
193 |
} |
|
194 |
||
195 |
function fail { |
|
196 |
func=$(caller 1 | cut -d ' ' -f 2) |
|
197 |
||
198 |
log_error "$func: $*" |
|
199 |
||
200 |
exit 2 |
|
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
201 |
} |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
202 |
|
2 | 203 |
function die { |
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
204 |
log_error "$*" |
2 | 205 |
exit 1 |
206 |
} |
|
207 |
||
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
208 |
function cmd { |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
209 |
log_cmd "$@" |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
210 |
|
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
211 |
"$@" || die "Failed" |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
212 |
} |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
213 |
|
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
214 |
function run_cmd { |
2 | 215 |
local msg=$1; shift |
216 |
||
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
217 |
log_info "$msg... " |
2 | 218 |
|
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
219 |
cmd "$@" |
2 | 220 |
} |
221 |
||
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
222 |
function indent () { |
8 | 223 |
local indent=$1; shift |
224 |
||
18
826103fe3c8c
update: abspath; fixup serials log; indent log_cmd
Tero Marttila <terom@paivola.fi>
parents:
17
diff
changeset
|
225 |
log_cmd "$@" |
826103fe3c8c
update: abspath; fixup serials log; indent log_cmd
Tero Marttila <terom@paivola.fi>
parents:
17
diff
changeset
|
226 |
|
26
d2fdfe98b7b9
update: fix indent leading whitespace; implement update_hosts_meta, but not used - commit workflow becomes a little weird
Tero Marttila <terom@paivola.fi>
parents:
22
diff
changeset
|
227 |
"$@" | sed "s/^/$indent/" |
31
2b7aad3466c6
update: log_warn, -q; ensure_dir; link_zone paivola-reverse; indent error exit
Tero Marttila <terom@paivola.fi>
parents:
30
diff
changeset
|
228 |
|
2b7aad3466c6
update: log_warn, -q; ensure_dir; link_zone paivola-reverse; indent error exit
Tero Marttila <terom@paivola.fi>
parents:
30
diff
changeset
|
229 |
return ${PIPESTATUS[0]} |
18
826103fe3c8c
update: abspath; fixup serials log; indent log_cmd
Tero Marttila <terom@paivola.fi>
parents:
17
diff
changeset
|
230 |
} |
826103fe3c8c
update: abspath; fixup serials log; indent log_cmd
Tero Marttila <terom@paivola.fi>
parents:
17
diff
changeset
|
231 |
|
41
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
232 |
function ensure_dir { |
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
233 |
local dir=$1 |
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
234 |
|
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
235 |
if [ ! -d $ROOT/$dir ]; then |
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
236 |
log_warn "Creating output dir: $dir" |
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
237 |
cmd mkdir $ROOT/$dir |
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
238 |
fi |
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
239 |
} |
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
240 |
|
18
826103fe3c8c
update: abspath; fixup serials log; indent log_cmd
Tero Marttila <terom@paivola.fi>
parents:
17
diff
changeset
|
241 |
function abspath () { |
826103fe3c8c
update: abspath; fixup serials log; indent log_cmd
Tero Marttila <terom@paivola.fi>
parents:
17
diff
changeset
|
242 |
echo "$ROOT/$1" |
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
243 |
} |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
244 |
|
28
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
245 |
## hg |
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
246 |
function hg { |
39
57551a87a93e
update: hardcode $REPO in hg
Tero Marttila <terom@paivola.fi>
parents:
38
diff
changeset
|
247 |
local repo=$REPO; shift |
28
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
248 |
|
31
2b7aad3466c6
update: log_warn, -q; ensure_dir; link_zone paivola-reverse; indent error exit
Tero Marttila <terom@paivola.fi>
parents:
30
diff
changeset
|
249 |
cmd $HG -R $ROOT/$repo "$@" |
28
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
250 |
} |
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
251 |
|
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
252 |
function hg_modified { |
39
57551a87a93e
update: hardcode $REPO in hg
Tero Marttila <terom@paivola.fi>
parents:
38
diff
changeset
|
253 |
hg id | grep -q '+' |
28
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
254 |
} |
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
255 |
|
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
256 |
function hg_user { |
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
257 |
if [ ${SUDO_USER:-} ]; then |
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
258 |
echo '-u' "$SUDO_USER" |
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
259 |
|
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
260 |
elif [ $HOME ] && [ -e $HOME/.hgrc ]; then |
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
261 |
log_debug "using .hgrc user" |
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
262 |
echo '' |
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
263 |
|
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
264 |
else |
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
265 |
echo '-u' "$USER" |
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
266 |
fi |
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
267 |
} |
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
268 |
|
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
269 |
function hg_diff { |
39
57551a87a93e
update: hardcode $REPO in hg
Tero Marttila <terom@paivola.fi>
parents:
38
diff
changeset
|
270 |
hg diff |
28
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
271 |
} |
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
272 |
|
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
273 |
function hg_commit { |
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
274 |
local msg=$2 |
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
275 |
local user_opt=$(hg_user) |
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
276 |
|
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
277 |
log_debug "commit: $user_opt: $msg" |
39
57551a87a93e
update: hardcode $REPO in hg
Tero Marttila <terom@paivola.fi>
parents:
38
diff
changeset
|
278 |
hg commit $user_opt -m "$msg" |
28
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
279 |
} |
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
280 |
|
2 | 281 |
|
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
282 |
## functions |
8 | 283 |
function check_update { |
284 |
# target |
|
285 |
local dst=$1; shift |
|
286 |
||
9 | 287 |
log_debug "check_update: $dst" |
8 | 288 |
|
289 |
# need update? |
|
290 |
local update= |
|
291 |
||
292 |
if [ ! -e $dst ] || [ $UPDATE_FORCE ]; then |
|
293 |
log_debug " update forced" |
|
294 |
update=y |
|
295 |
fi |
|
296 |
||
297 |
# check deps |
|
298 |
for dep in "$@"; do |
|
299 |
# don't bother checking if already figured out |
|
300 |
[ $update ] && continue |
|
301 |
||
302 |
# check |
|
41
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
303 |
if [ ! -e $ROOT/$dep ]; then |
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
304 |
fail "$dst: Missing source: $dep" |
8 | 305 |
|
41
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
306 |
elif [ $ROOT/$dst -ot $ROOT/$dep ]; then |
8 | 307 |
log_debug " changed: $dep" |
308 |
update=y |
|
309 |
fi |
|
310 |
done |
|
311 |
||
312 |
[ ! $update ] && log_debug " up-to-date" |
|
313 |
||
314 |
# return |
|
315 |
[ $update ] |
|
316 |
} |
|
317 |
||
318 |
function do_update { |
|
319 |
local dst=$1; shift |
|
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
320 |
local tmp=$dst.new |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
321 |
|
9 | 322 |
log_debug "update: $dst" |
28
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
323 |
cmd "$@" > $ROOT/$tmp |
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
324 |
|
8 | 325 |
# compare |
28
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
326 |
if [ -e $ROOT/$dst ] && [ $UPDATE_DIFF ]; then |
8 | 327 |
log_debug " changes:" |
328 |
||
329 |
# terse |
|
32
694dab02a6b0
update: do_update: ignore diff error exit
Tero Marttila <terom@paivola.fi>
parents:
31
diff
changeset
|
330 |
indent " " diff --unified=1 $ROOT/$dst $ROOT/$tmp || true |
8 | 331 |
fi |
332 |
||
333 |
if [ $UPDATE_NOOP ]; then |
|
334 |
# cleanup |
|
9 | 335 |
log_debug " no-op" |
8 | 336 |
|
28
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
337 |
cmd rm $ROOT/$tmp |
8 | 338 |
else |
339 |
# commit |
|
9 | 340 |
log_debug " update" |
8 | 341 |
|
28
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
342 |
cmd mv $ROOT/$tmp $ROOT/$dst |
8 | 343 |
fi |
344 |
} |
|
345 |
||
346 |
function update { |
|
347 |
local dst=$1; shift; |
|
41
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
348 |
local msg=$1; shift |
8 | 349 |
|
350 |
local sep= |
|
351 |
local dep=() |
|
352 |
local cmd=() |
|
353 |
||
354 |
for arg in "$@"; do |
|
355 |
if [ $arg == '--' ]; then |
|
356 |
sep=y |
|
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
357 |
fi |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
358 |
|
8 | 359 |
if [ $sep ]; then |
360 |
cmd=("${cmd[@]:-}" "$arg") |
|
361 |
else |
|
362 |
dep=("${dep[@]:-}" "$arg") |
|
363 |
fi |
|
364 |
done |
|
365 |
||
366 |
[ ! $sep ] && fail "Invalid args given: $@" |
|
367 |
||
41
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
368 |
if check_update $dst "${dep[@]}"; then |
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
369 |
log_info "$msg..." |
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
370 |
|
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
371 |
do_update $dst "${cmd[@]}" |
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
372 |
else |
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
373 |
log_debug "$msg: not changed" |
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
374 |
|
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
375 |
fi |
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
376 |
} |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
377 |
|
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
378 |
function check_link { |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
379 |
local lnk=$1 |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
380 |
local tgt=$2 |
14
b883ef452cd8
fix handling of initial serial
Tero Marttila <terom@paivola.fi>
parents:
13
diff
changeset
|
381 |
|
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
382 |
[ ! -e $ROOT/$lnk ] || [ $(readlink $ROOT/$lnk) != $ROOT/$tgt ] |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
383 |
} |
8 | 384 |
|
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
385 |
function do_link { |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
386 |
local lnk=$1 |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
387 |
local tgt=$2 |
8 | 388 |
|
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
389 |
cmd ln -sf $ROOT/$tgt $ROOT/$lnk |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
390 |
} |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
391 |
|
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
392 |
## hosts |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
393 |
# copy hosts input zone verbatim |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
394 |
function copy_hosts { |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
395 |
local zone=$1 |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
396 |
local base=$2 |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
397 |
|
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
398 |
if check_update $zone $base; then |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
399 |
log_info "Copying hosts $zone <- $base..." |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
400 |
|
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
401 |
do_update $zone \ |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
402 |
cat $ROOT/$base |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
403 |
else |
41
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
404 |
log_skip "Copying hosts $zone <- $base: not changed" |
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
405 |
fi |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
406 |
} |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
407 |
|
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
408 |
# generate hosts zone from input zone |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
409 |
function update_hosts { |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
410 |
local zone=$1; shift |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
411 |
local base=$1; shift |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
412 |
|
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
413 |
if check_update $zone $base; then |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
414 |
log_info "Generating hosts $zone <- $base..." |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
415 |
|
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
416 |
do_update $zone \ |
40 | 417 |
$BIN/process-zone $PROCESS_ARGS $ROOT/$base "$@" |
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
418 |
else |
41
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
419 |
log_skip "Generating hosts $zone <- $base: not changed" |
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
420 |
fi |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
421 |
} |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
422 |
|
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
423 |
## actions |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
424 |
# serial |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
425 |
function update_serial { |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
426 |
local zone=$1; shift |
8 | 427 |
|
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
428 |
local serial=$SERIALS/$zone.serial |
41
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
429 |
|
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
430 |
# read |
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
431 |
local old=$(test -e $ROOT/$serial && cat $ROOT/$serial || echo '') |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
432 |
|
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
433 |
log_info "Updating $serial..." |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
434 |
|
41
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
435 |
cmd $BIN/update-serial $ROOT/$serial |
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
436 |
|
41
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
437 |
# read |
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
438 |
local new=$(cat $ROOT/$serial) |
8 | 439 |
|
440 |
log_debug " $old -> $new" |
|
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
441 |
} |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
442 |
|
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
443 |
function link_serial { |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
444 |
local zone=$1 |
36
3208cd6540dc
update: restructure zones/, manage .pvl
Tero Marttila <terom@paivola.fi>
parents:
32
diff
changeset
|
445 |
local base=$2 |
3208cd6540dc
update: restructure zones/, manage .pvl
Tero Marttila <terom@paivola.fi>
parents:
32
diff
changeset
|
446 |
|
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
447 |
local lnk=$SERIALS/$zone.serial |
36
3208cd6540dc
update: restructure zones/, manage .pvl
Tero Marttila <terom@paivola.fi>
parents:
32
diff
changeset
|
448 |
local tgt=$SERIALS/$base.serial |
3208cd6540dc
update: restructure zones/, manage .pvl
Tero Marttila <terom@paivola.fi>
parents:
32
diff
changeset
|
449 |
|
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
450 |
if check_link $lnk $tgt; then |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
451 |
log_info "Linking $lnk -> $tgt..." |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
452 |
|
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
453 |
do_link $lnk $tgt |
36
3208cd6540dc
update: restructure zones/, manage .pvl
Tero Marttila <terom@paivola.fi>
parents:
32
diff
changeset
|
454 |
|
3208cd6540dc
update: restructure zones/, manage .pvl
Tero Marttila <terom@paivola.fi>
parents:
32
diff
changeset
|
455 |
else |
41
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
456 |
log_skip "Linking $lnk -> $tgt: not changed" |
36
3208cd6540dc
update: restructure zones/, manage .pvl
Tero Marttila <terom@paivola.fi>
parents:
32
diff
changeset
|
457 |
fi |
3208cd6540dc
update: restructure zones/, manage .pvl
Tero Marttila <terom@paivola.fi>
parents:
32
diff
changeset
|
458 |
} |
3208cd6540dc
update: restructure zones/, manage .pvl
Tero Marttila <terom@paivola.fi>
parents:
32
diff
changeset
|
459 |
|
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
460 |
# zone |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
461 |
function copy_zone { |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
462 |
local view=$1 |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
463 |
local zone=$2 |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
464 |
local base=${3:-$zone} |
2 | 465 |
|
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
466 |
local out=$ZONES/$view/$zone |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
467 |
local src=$DATA/$base |
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
468 |
|
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
469 |
if check_update $out $src; then |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
470 |
log_info "Copying $out <- $src..." |
8 | 471 |
|
41
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
472 |
do_update $out \ |
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
473 |
cat $ROOT/$src |
8 | 474 |
else |
41
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
475 |
log_skip "Copying $out <- $src: not changed" |
8 | 476 |
fi |
2 | 477 |
} |
478 |
||
479 |
function update_zone { |
|
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
480 |
local view=$1 |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
481 |
local zone=$2 |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
482 |
local base=${3:-$zone} |
8 | 483 |
|
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
484 |
local out=$ZONES/$view/$zone |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
485 |
local src=$DATA/$base.zone |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
486 |
local lnk=$ZONES/$base |
41
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
487 |
|
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
488 |
local serial=$SERIALS/$base.serial |
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
489 |
|
41
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
490 |
if check_update $out $src $serial; then |
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
491 |
log_info "Generating $out <- $src..." |
8 | 492 |
|
493 |
do_update $out \ |
|
40 | 494 |
$BIN/expand-zone $ROOT/$src \ |
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
495 |
--serial $ROOT/$serial \ |
18
826103fe3c8c
update: abspath; fixup serials log; indent log_cmd
Tero Marttila <terom@paivola.fi>
parents:
17
diff
changeset
|
496 |
--expand zones=$(abspath $ZONES) \ |
8 | 497 |
--expand view=$view |
498 |
else |
|
41
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
499 |
log_skip "Generating $out <- $src: not changed" |
8 | 500 |
fi |
501 |
} |
|
502 |
||
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
503 |
function link_zone { |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
504 |
local view=$1 |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
505 |
local zone=$2 |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
506 |
local base=${3:-$zone} |
36
3208cd6540dc
update: restructure zones/, manage .pvl
Tero Marttila <terom@paivola.fi>
parents:
32
diff
changeset
|
507 |
|
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
508 |
local out=$ZONES/$view/$zone |
41
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
509 |
|
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
510 |
# find tgt |
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
511 |
for tgt in $ZONES/$view/$base $ZONES/common/$base; do |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
512 |
[ $tgt != $out ] && [ -e $tgt ] && break |
36
3208cd6540dc
update: restructure zones/, manage .pvl
Tero Marttila <terom@paivola.fi>
parents:
32
diff
changeset
|
513 |
done |
3208cd6540dc
update: restructure zones/, manage .pvl
Tero Marttila <terom@paivola.fi>
parents:
32
diff
changeset
|
514 |
|
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
515 |
if check_link $out $tgt; then |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
516 |
log_info "Linking $out -> $tgt..." |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
517 |
|
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
518 |
do_link $out $tgt |
30
1a8bc67b1eb7
update: link_zones for paivola.*.zone -> paivola.zone
Tero Marttila <terom@paivola.fi>
parents:
29
diff
changeset
|
519 |
else |
41
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
520 |
log_skip "Linking $out -> $tgt: not changed" |
30
1a8bc67b1eb7
update: link_zones for paivola.*.zone -> paivola.zone
Tero Marttila <terom@paivola.fi>
parents:
29
diff
changeset
|
521 |
fi |
1a8bc67b1eb7
update: link_zones for paivola.*.zone -> paivola.zone
Tero Marttila <terom@paivola.fi>
parents:
29
diff
changeset
|
522 |
} |
1a8bc67b1eb7
update: link_zones for paivola.*.zone -> paivola.zone
Tero Marttila <terom@paivola.fi>
parents:
29
diff
changeset
|
523 |
|
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
524 |
## Tests |
13 | 525 |
function check_hosts { |
526 |
local hosts=$1; shift 1 |
|
527 |
||
40 | 528 |
local cmd=($BIN/process-zone $PROCESS_ARGS $ROOT/$hosts --check-hosts "$@") |
13 | 529 |
|
530 |
if "${cmd[@]}" -q; then |
|
41
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
531 |
log_skip "Check $hosts: OK" |
13 | 532 |
else |
533 |
log_error " Check $hosts: Failed" |
|
534 |
||
535 |
indent " " "${cmd[@]}" |
|
536 |
||
537 |
exit 1 |
|
538 |
fi |
|
539 |
} |
|
540 |
||
10 | 541 |
function check_zone { |
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
542 |
local view=$1 |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
543 |
local zone=$2 |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
544 |
local origin=$3 |
10 | 545 |
|
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
546 |
local src=$ZONES/$view/$zone |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
547 |
|
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
548 |
local cmd=($NAMED_CHECKZONE $origin $ROOT/$src) |
13 | 549 |
|
10 | 550 |
# test |
13 | 551 |
# XXX: checkzone is very specific about the order of arguments, -q must be first |
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
552 |
if $NAMED_CHECKZONE -q $origin $ROOT/$src; then |
41
baae373b787e
update: log_skip; simplify update_serial args; check_update tests for deps
Tero Marttila <terom@paivola.fi>
parents:
40
diff
changeset
|
553 |
log_skip "Check $src ($origin): OK" |
10 | 554 |
else |
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
555 |
log_error " Check $src ($origin): Failed:" |
10 | 556 |
|
13 | 557 |
indent " " "${cmd[@]}" |
558 |
||
559 |
exit 1 |
|
10 | 560 |
fi |
561 |
} |
|
562 |
||
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
563 |
## Deploy |
27 | 564 |
# deploy new zone data to bind |
565 |
function deploy_zones { |
|
31
2b7aad3466c6
update: log_warn, -q; ensure_dir; link_zone paivola-reverse; indent error exit
Tero Marttila <terom@paivola.fi>
parents:
30
diff
changeset
|
566 |
indent " rndc: " $RNDC reload |
27 | 567 |
} |
568 |
||
21 | 569 |
# commit data changes |
28
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
570 |
function commit_data { |
39
57551a87a93e
update: hardcode $REPO in hg
Tero Marttila <terom@paivola.fi>
parents:
38
diff
changeset
|
571 |
local repo=$REPO |
21 | 572 |
|
39
57551a87a93e
update: hardcode $REPO in hg
Tero Marttila <terom@paivola.fi>
parents:
38
diff
changeset
|
573 |
if hg_modified; then |
28
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
574 |
log_info "Commit changes in $repo:" |
21 | 575 |
|
39
57551a87a93e
update: hardcode $REPO in hg
Tero Marttila <terom@paivola.fi>
parents:
38
diff
changeset
|
576 |
indent " " hg_diff |
21 | 577 |
|
39
57551a87a93e
update: hardcode $REPO in hg
Tero Marttila <terom@paivola.fi>
parents:
38
diff
changeset
|
578 |
hg_commit "$COMMIT_MSG" |
21 | 579 |
else |
28
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
580 |
log_info "Commit changes in $repo: no changes" |
21 | 581 |
fi |
582 |
} |
|
583 |
||
2 | 584 |
function main { |
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
585 |
# test tty |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
586 |
[ -t 1 ] && IS_TTY=y |
31
2b7aad3466c6
update: log_warn, -q; ensure_dir; link_zone paivola-reverse; indent error exit
Tero Marttila <terom@paivola.fi>
parents:
30
diff
changeset
|
587 |
|
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
588 |
parse_args "$@" |
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
589 |
|
28
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
590 |
## test env |
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
591 |
[ -d $ROOT/$DATA ] || die "Missing data: $ROOT/$DATA" |
31
2b7aad3466c6
update: log_warn, -q; ensure_dir; link_zone paivola-reverse; indent error exit
Tero Marttila <terom@paivola.fi>
parents:
30
diff
changeset
|
592 |
ensure_dir $ZONES |
2b7aad3466c6
update: log_warn, -q; ensure_dir; link_zone paivola-reverse; indent error exit
Tero Marttila <terom@paivola.fi>
parents:
30
diff
changeset
|
593 |
|
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
594 |
# output dirs |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
595 |
local views=(internal external) |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
596 |
|
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
597 |
for view in "${views[@]}" "common" "hosts" "includes"; do |
31
2b7aad3466c6
update: log_warn, -q; ensure_dir; link_zone paivola-reverse; indent error exit
Tero Marttila <terom@paivola.fi>
parents:
30
diff
changeset
|
598 |
ensure_dir $ZONES/$view |
2b7aad3466c6
update: log_warn, -q; ensure_dir; link_zone paivola-reverse; indent error exit
Tero Marttila <terom@paivola.fi>
parents:
30
diff
changeset
|
599 |
done |
28
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
600 |
|
27 | 601 |
## hosts |
602 |
# test |
|
13 | 603 |
log "Testing hosts..." |
21 | 604 |
check_hosts $DATA/paivola.txt --check-exempt ufc |
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
605 |
|
27 | 606 |
# update |
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
607 |
log "Generating host zones..." |
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
608 |
# zone base *args |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
609 |
update_hosts $ZONES/hosts/paivola:internal $DATA/paivola.txt --forward-zone --forward-txt --forward-mx $FORWARD_MX |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
610 |
update_hosts $ZONES/hosts/paivola:external $DATA/paivola.txt --forward-zone |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
611 |
update_hosts $ZONES/hosts/194.197.235 $DATA/paivola.txt --reverse-zone $REVERSE_ZONE --reverse-domain $REVERSE_DOMAIN |
36
3208cd6540dc
update: restructure zones/, manage .pvl
Tero Marttila <terom@paivola.fi>
parents:
32
diff
changeset
|
612 |
|
3208cd6540dc
update: restructure zones/, manage .pvl
Tero Marttila <terom@paivola.fi>
parents:
32
diff
changeset
|
613 |
|
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
614 |
update_hosts $ZONES/hosts/10 $DATA/pvl.txt --reverse-zone 10 --reverse-domain pvl -q |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
615 |
update_hosts $ZONES/hosts/192.168 $DATA/pvl.txt --reverse-zone 192.168 --reverse-domain pvl -q |
36
3208cd6540dc
update: restructure zones/, manage .pvl
Tero Marttila <terom@paivola.fi>
parents:
32
diff
changeset
|
616 |
|
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
617 |
# XXX: unsupported --forward-zone with pvl.txt |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
618 |
# update_hosts $ZONES/hosts/pvl $DATA/pvl.txt --forward-zone |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
619 |
copy_hosts $ZONES/hosts/pvl $DATA/pvl.txt |
2 | 620 |
|
27 | 621 |
## zones |
622 |
# parts |
|
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
623 |
log "Copying zone includes..." |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
624 |
# view zone base |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
625 |
copy_zone includes paivola:internal paivola.zone.internal |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
626 |
copy_zone includes paivola:external paivola.zone.external |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
627 |
copy_zone includes paivola.auto paivola.zone.auto |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
628 |
copy_zone includes paivola.services paivola.zone.services |
2 | 629 |
|
27 | 630 |
# serials |
13 | 631 |
if [ $SERIAL_NOUPDATE ]; then |
18
826103fe3c8c
update: abspath; fixup serials log; indent log_cmd
Tero Marttila <terom@paivola.fi>
parents:
17
diff
changeset
|
632 |
log "Updating serials: skipped" |
826103fe3c8c
update: abspath; fixup serials log; indent log_cmd
Tero Marttila <terom@paivola.fi>
parents:
17
diff
changeset
|
633 |
|
13 | 634 |
else |
18
826103fe3c8c
update: abspath; fixup serials log; indent log_cmd
Tero Marttila <terom@paivola.fi>
parents:
17
diff
changeset
|
635 |
log "Updating serials..." |
826103fe3c8c
update: abspath; fixup serials log; indent log_cmd
Tero Marttila <terom@paivola.fi>
parents:
17
diff
changeset
|
636 |
|
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
637 |
# zone base |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
638 |
update_serial pvl |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
639 |
link_serial 10 pvl |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
640 |
link_serial 192.168 pvl |
36
3208cd6540dc
update: restructure zones/, manage .pvl
Tero Marttila <terom@paivola.fi>
parents:
32
diff
changeset
|
641 |
|
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
642 |
update_serial paivola |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
643 |
update_serial 194.197.235 |
13 | 644 |
fi |
645 |
||
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
646 |
# zones |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
647 |
log "Updating zones..." |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
648 |
# view zone base |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
649 |
update_zone internal pvl |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
650 |
update_zone internal paivola |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
651 |
update_zone external paivola |
10 | 652 |
|
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
653 |
update_zone internal 10 |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
654 |
update_zone internal 192.168 |
36
3208cd6540dc
update: restructure zones/, manage .pvl
Tero Marttila <terom@paivola.fi>
parents:
32
diff
changeset
|
655 |
|
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
656 |
update_zone common 194.197.235 |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
657 |
link_zone internal 194.197.235 |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
658 |
link_zone external 194.197.235 |
36
3208cd6540dc
update: restructure zones/, manage .pvl
Tero Marttila <terom@paivola.fi>
parents:
32
diff
changeset
|
659 |
|
27 | 660 |
# test |
10 | 661 |
log "Testing zones..." |
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
662 |
# view zone origin |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
663 |
check_zone internal paivola paivola.fi |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
664 |
check_zone external paivola paivola.fi |
36
3208cd6540dc
update: restructure zones/, manage .pvl
Tero Marttila <terom@paivola.fi>
parents:
32
diff
changeset
|
665 |
|
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
666 |
check_zone internal 10 10.in-addr.arpa |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
667 |
check_zone internal 192.168 192.168.in-addr.arpa |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
668 |
check_zone common 194.197.235 235.197.194.in-addr.arpa |
10 | 669 |
|
30
1a8bc67b1eb7
update: link_zones for paivola.*.zone -> paivola.zone
Tero Marttila <terom@paivola.fi>
parents:
29
diff
changeset
|
670 |
# extra zones... |
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
671 |
local base=paivola |
30
1a8bc67b1eb7
update: link_zones for paivola.*.zone -> paivola.zone
Tero Marttila <terom@paivola.fi>
parents:
29
diff
changeset
|
672 |
local link_zones=(paivola.fi paivola.net paivola.org paivola.info paivola.mobi xn--pivl-load8j.fi) |
1a8bc67b1eb7
update: link_zones for paivola.*.zone -> paivola.zone
Tero Marttila <terom@paivola.fi>
parents:
29
diff
changeset
|
673 |
|
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
674 |
log "Linking zones..." |
30
1a8bc67b1eb7
update: link_zones for paivola.*.zone -> paivola.zone
Tero Marttila <terom@paivola.fi>
parents:
29
diff
changeset
|
675 |
for view in "${views[@]}"; do |
1a8bc67b1eb7
update: link_zones for paivola.*.zone -> paivola.zone
Tero Marttila <terom@paivola.fi>
parents:
29
diff
changeset
|
676 |
for zone in "${link_zones[@]}"; do |
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
677 |
link_zone $view $zone $base |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
678 |
check_zone $view $zone $zone |
30
1a8bc67b1eb7
update: link_zones for paivola.*.zone -> paivola.zone
Tero Marttila <terom@paivola.fi>
parents:
29
diff
changeset
|
679 |
done |
1a8bc67b1eb7
update: link_zones for paivola.*.zone -> paivola.zone
Tero Marttila <terom@paivola.fi>
parents:
29
diff
changeset
|
680 |
done |
1a8bc67b1eb7
update: link_zones for paivola.*.zone -> paivola.zone
Tero Marttila <terom@paivola.fi>
parents:
29
diff
changeset
|
681 |
|
27 | 682 |
## deploy |
683 |
if [ $DEPLOY_SKIP ]; then |
|
684 |
log "Deploy zones: skipped" |
|
21 | 685 |
|
27 | 686 |
else |
687 |
log "Deploy zones..." |
|
688 |
||
689 |
deploy_zones |
|
690 |
fi |
|
691 |
||
692 |
## commit |
|
21 | 693 |
if [ $COMMIT_SKIP ] && [ ! $COMMIT_FORCE ]; then |
694 |
log "Commit data: skipped" |
|
695 |
||
696 |
else |
|
697 |
log "Commit data..." |
|
39
57551a87a93e
update: hardcode $REPO in hg
Tero Marttila <terom@paivola.fi>
parents:
38
diff
changeset
|
698 |
commit_data |
21 | 699 |
fi |
2 | 700 |
} |
701 |
||
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
702 |
main "$@" |