author | Tero Marttila <tero.marttila@aalto.fi> |
Tue, 03 Mar 2015 11:41:32 +0200 | |
changeset 712 | 97fa1b086b36 |
parent 664 | 10ac59f9d4e7 |
child 715 | 76ed62924d50 |
permissions | -rw-r--r-- |
628
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
1 |
#HOSTS_CHARSET='utf-8' |
654
8069b08e90ac
bin/update: fixup relative/absolute paths
Tero Marttila <tero.marttila@aalto.fi>
parents:
651
diff
changeset
|
2 |
HOSTS_INCLUDE="etc/hosts" |
628
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
3 |
|
654
8069b08e90ac
bin/update: fixup relative/absolute paths
Tero Marttila <tero.marttila@aalto.fi>
parents:
651
diff
changeset
|
4 |
# absolute path! |
8069b08e90ac
bin/update: fixup relative/absolute paths
Tero Marttila <tero.marttila@aalto.fi>
parents:
651
diff
changeset
|
5 |
ZONES_INCLUDE="$SRV/var/zones" |
643
eda838f84366
update: use pvl.dns-process for update_zone
Tero Marttila <tero.marttila@aalto.fi>
parents:
632
diff
changeset
|
6 |
|
628
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
7 |
NAMED_CHECKZONE=/usr/sbin/named-checkzone |
712
97fa1b086b36
lib/pvl/hosts/zone: use service bind9 reload instead of rndc
Tero Marttila <tero.marttila@aalto.fi>
parents:
664
diff
changeset
|
8 |
NAMED_SERVICE=bind9 |
628
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
9 |
|
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
10 |
## Generate forward zone from hosts hosts using pvl.hosts-forward |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
11 |
# |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
12 |
# update_hosts_forward $out $src |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
13 |
function update_hosts_forward { |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
14 |
local out="$1" |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
15 |
local src="$2" |
664
10ac59f9d4e7
lib/pvl pvl/hosts/update.sh: handle either file or directory based dhcp/hosts, zones/forward, zones/reverse sources
Tero Marttila <terom@paivola.fi>
parents:
654
diff
changeset
|
16 |
local srcs=($(list_tree $src)) |
628
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
17 |
local msg="$out: Generating forward hosts zone: $src" |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
18 |
|
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
19 |
if apply_check "$out" "${srcs[@]}"; then |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
20 |
log_skip "$msg" |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
21 |
else |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
22 |
log_apply "$msg" |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
23 |
|
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
24 |
apply_cmd "$out" $OPT/bin/pvl.hosts-forward \ |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
25 |
--hosts-include="$HOSTS_INCLUDE" \ |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
26 |
"$src" |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
27 |
fi |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
28 |
} |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
29 |
|
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
30 |
## Generate reverse zone from hosts hosts using pvl.hosts-reverse |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
31 |
# |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
32 |
# update_hosts_reverse $out $src |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
33 |
function update_hosts_reverse { |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
34 |
local out="$1" |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
35 |
local src="$2" |
664
10ac59f9d4e7
lib/pvl pvl/hosts/update.sh: handle either file or directory based dhcp/hosts, zones/forward, zones/reverse sources
Tero Marttila <terom@paivola.fi>
parents:
654
diff
changeset
|
36 |
local srcs=($(list_tree $src)) |
628
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
37 |
local msg="$out: Generating reverse hosts zone: $src" |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
38 |
|
664
10ac59f9d4e7
lib/pvl pvl/hosts/update.sh: handle either file or directory based dhcp/hosts, zones/forward, zones/reverse sources
Tero Marttila <terom@paivola.fi>
parents:
654
diff
changeset
|
39 |
if apply_check "$out" "${srcs[@]}"; then |
628
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
40 |
log_skip "$msg" |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
41 |
else |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
42 |
log_apply "$msg" |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
43 |
|
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
44 |
apply_cmd "$out" $OPT/bin/pvl.hosts-reverse \ |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
45 |
--hosts-include="$HOSTS_INCLUDE" \ |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
46 |
"$src" |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
47 |
fi |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
48 |
} |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
49 |
|
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
50 |
function update_zone_include { |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
51 |
local out="$1" |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
52 |
local src="$2" |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
53 |
local msg="$out: Copy zone include: $src" |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
54 |
|
651
599dc457c590
lib/pvl/hosts: fix update_zone and update_zone_include
Tero Marttila <tero.marttila@aalto.fi>
parents:
648
diff
changeset
|
55 |
if apply_check "$out" "${@:2}"; then |
628
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
56 |
log_skip "$msg" |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
57 |
else |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
58 |
log_apply "$msg" |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
59 |
|
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
60 |
apply_cmd "$out" cat \ |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
61 |
"$src" |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
62 |
fi |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
63 |
} |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
64 |
|
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
65 |
|
648
8e3e6be9ac70
bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents:
643
diff
changeset
|
66 |
## Update list of zone $INCLUDEs from zone file |
8e3e6be9ac70
bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents:
643
diff
changeset
|
67 |
# |
8e3e6be9ac70
bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents:
643
diff
changeset
|
68 |
# update_zone_includes var/include-cache/$zone etc/zones/$zone |
8e3e6be9ac70
bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents:
643
diff
changeset
|
69 |
# |
8e3e6be9ac70
bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents:
643
diff
changeset
|
70 |
function update_zone_includes { |
8e3e6be9ac70
bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents:
643
diff
changeset
|
71 |
local out="$1" |
628
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
72 |
local src="$2" |
648
8e3e6be9ac70
bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents:
643
diff
changeset
|
73 |
local includes="$ZONES_INCLUDE" |
628
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
74 |
|
648
8e3e6be9ac70
bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents:
643
diff
changeset
|
75 |
if [ "$UPDATE_INCLUDES" = 1 ]; then |
8e3e6be9ac70
bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents:
643
diff
changeset
|
76 |
log_force "$out: Force zone includes: $src" |
8e3e6be9ac70
bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents:
643
diff
changeset
|
77 |
|
8e3e6be9ac70
bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents:
643
diff
changeset
|
78 |
elif apply_check "$out" "$src"; then |
8e3e6be9ac70
bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents:
643
diff
changeset
|
79 |
log_skip "$out: Skip zone includes: $src" |
8e3e6be9ac70
bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents:
643
diff
changeset
|
80 |
|
8e3e6be9ac70
bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents:
643
diff
changeset
|
81 |
return |
8e3e6be9ac70
bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents:
643
diff
changeset
|
82 |
|
8e3e6be9ac70
bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents:
643
diff
changeset
|
83 |
elif [ "$UPDATE_INCLUDES" = 0 ]; then |
8e3e6be9ac70
bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents:
643
diff
changeset
|
84 |
log_noop "$out: Noop zone includes: $src" |
8e3e6be9ac70
bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents:
643
diff
changeset
|
85 |
|
8e3e6be9ac70
bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents:
643
diff
changeset
|
86 |
return |
8e3e6be9ac70
bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents:
643
diff
changeset
|
87 |
else |
8e3e6be9ac70
bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents:
643
diff
changeset
|
88 |
log_apply "$out: Update zone includes: $src" |
628
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
89 |
fi |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
90 |
|
648
8e3e6be9ac70
bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents:
643
diff
changeset
|
91 |
apply_cmd "$out" $OPT/bin/pvl.dns-includes \ |
8e3e6be9ac70
bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents:
643
diff
changeset
|
92 |
--include-path=$ZONES_INCLUDE \ |
8e3e6be9ac70
bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents:
643
diff
changeset
|
93 |
"$src" |
628
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
94 |
} |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
95 |
|
643
eda838f84366
update: use pvl.dns-process for update_zone
Tero Marttila <tero.marttila@aalto.fi>
parents:
632
diff
changeset
|
96 |
## Update the cached .serial for the given zone, if the zone has changed: |
628
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
97 |
# |
643
eda838f84366
update: use pvl.dns-process for update_zone
Tero Marttila <tero.marttila@aalto.fi>
parents:
632
diff
changeset
|
98 |
# update_serial var/serials/$zone $serial $deps... |
628
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
99 |
# |
643
eda838f84366
update: use pvl.dns-process for update_zone
Tero Marttila <tero.marttila@aalto.fi>
parents:
632
diff
changeset
|
100 |
# Supports UPDATE_SERIAL= |
628
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
101 |
function update_zone_serial { |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
102 |
local out="$1" |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
103 |
local serial="$2" |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
104 |
|
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
105 |
local old=$(test -e "$out" && cat "$out" || echo '') |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
106 |
|
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
107 |
# test |
629 | 108 |
if [ "$UPDATE_SERIAL" = 1 ]; then |
628
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
109 |
log_force "$out: Force serial $old <- $serial" |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
110 |
|
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
111 |
elif apply_check "$out" "${@:3}"; then |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
112 |
log_skip "$out: Skip serial: $old <- $serial" |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
113 |
|
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
114 |
return |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
115 |
|
629 | 116 |
elif [ "$UPDATE_SERIAL" = 0 ]; then |
628
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
117 |
log_noop "$out: Noop serial: $old <- $serial" |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
118 |
|
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
119 |
return |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
120 |
|
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
121 |
else |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
122 |
log_apply "$out: Update serial: $old <- $serial" |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
123 |
fi |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
124 |
|
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
125 |
echo "$serial" > $out |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
126 |
} |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
127 |
|
643
eda838f84366
update: use pvl.dns-process for update_zone
Tero Marttila <tero.marttila@aalto.fi>
parents:
632
diff
changeset
|
128 |
## Generate zone file from source using pvl.dns-process: |
628
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
129 |
# |
643
eda838f84366
update: use pvl.dns-process for update_zone
Tero Marttila <tero.marttila@aalto.fi>
parents:
632
diff
changeset
|
130 |
# update_zone var/zones/$zone etc/zones/$zone var/serials/$zone |
eda838f84366
update: use pvl.dns-process for update_zone
Tero Marttila <tero.marttila@aalto.fi>
parents:
632
diff
changeset
|
131 |
# |
eda838f84366
update: use pvl.dns-process for update_zone
Tero Marttila <tero.marttila@aalto.fi>
parents:
632
diff
changeset
|
132 |
# Sets the SOA serial, and adjusts the $INCLUDE paths |
628
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
133 |
function update_zone { |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
134 |
local out="$1" |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
135 |
local src="$2" |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
136 |
local serial="$3" |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
137 |
local serial_opt= |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
138 |
local msg="$out: Generate zone: $src" |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
139 |
|
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
140 |
if [ -n "$serial" -a -f "$serial" ]; then |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
141 |
serial_opt="--serial=$(cat "$serial")" |
629 | 142 |
elif [ "$UPDATE_SERIAL" = 0 ]; then |
643
eda838f84366
update: use pvl.dns-process for update_zone
Tero Marttila <tero.marttila@aalto.fi>
parents:
632
diff
changeset
|
143 |
warn "$out: omit noop'd serial" |
628
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
144 |
else |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
145 |
fail "$out: missing serial: $serial" |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
146 |
fi |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
147 |
|
651
599dc457c590
lib/pvl/hosts: fix update_zone and update_zone_include
Tero Marttila <tero.marttila@aalto.fi>
parents:
648
diff
changeset
|
148 |
if apply_check "$out" "${@:2}"; then |
628
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
149 |
log_skip "$msg" |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
150 |
else |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
151 |
log_apply "$msg" |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
152 |
|
643
eda838f84366
update: use pvl.dns-process for update_zone
Tero Marttila <tero.marttila@aalto.fi>
parents:
632
diff
changeset
|
153 |
apply_cmd "$out" $OPT/bin/pvl.dns-process \ |
628
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
154 |
$serial_opt \ |
643
eda838f84366
update: use pvl.dns-process for update_zone
Tero Marttila <tero.marttila@aalto.fi>
parents:
632
diff
changeset
|
155 |
--include-path=$ZONES_INCLUDE \ |
628
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
156 |
"$src" |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
157 |
fi |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
158 |
} |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
159 |
|
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
160 |
## Test zone file for validity using named-checkzone: |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
161 |
# |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
162 |
# check_zone ..../$zone $origin |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
163 |
function test_zone { |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
164 |
local zone=$1 |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
165 |
local origin=$2 |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
166 |
|
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
167 |
log_check "$zone: Checking zone @$origin..." |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
168 |
|
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
169 |
# checkzone is very specific about the order of arguments, -q must be first |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
170 |
test_cmd $zone \ |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
171 |
$NAMED_CHECKZONE $origin $zone |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
172 |
} |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
173 |
|
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
174 |
## Load update zonefiles into bind: |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
175 |
# |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
176 |
# reload_zones |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
177 |
function reload_zones { |
629 | 178 |
if [ "$UPDATE_RELOAD" = 1 ]; then |
628
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
179 |
log_force "Reload zones" |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
180 |
|
629 | 181 |
elif [ "$UPDATE_RELOAD" = 0 ]; then |
628
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
182 |
log_noop "Skip reload zones" |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
183 |
|
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
184 |
return |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
185 |
|
712
97fa1b086b36
lib/pvl/hosts/zone: use service bind9 reload instead of rndc
Tero Marttila <tero.marttila@aalto.fi>
parents:
664
diff
changeset
|
186 |
elif ! service_status $NAMED_SERVICE; then |
97fa1b086b36
lib/pvl/hosts/zone: use service bind9 reload instead of rndc
Tero Marttila <tero.marttila@aalto.fi>
parents:
664
diff
changeset
|
187 |
log_skip "named not running; did not restart" |
628
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
188 |
|
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
189 |
return |
712
97fa1b086b36
lib/pvl/hosts/zone: use service bind9 reload instead of rndc
Tero Marttila <tero.marttila@aalto.fi>
parents:
664
diff
changeset
|
190 |
|
628
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
191 |
else |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
192 |
log_apply "Reload zones" |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
193 |
fi |
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
194 |
|
712
97fa1b086b36
lib/pvl/hosts/zone: use service bind9 reload instead of rndc
Tero Marttila <tero.marttila@aalto.fi>
parents:
664
diff
changeset
|
195 |
service_reload $NAMED_SERVICE |
628
b10ad946d01d
update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff
changeset
|
196 |
} |