author | Tero Marttila <terom@paivola.fi> |
Fri, 10 May 2013 00:05:25 +0300 | |
changeset 80 | b58236f9ea7b |
parent 79 | 87c5570a205f |
child 82 | 26a307558602 |
permissions | -rwxr-xr-x |
2 | 1 |
#!/bin/bash |
2 |
# vim: set ft=sh : |
|
3 |
||
4 |
set -ue |
|
5 |
||
52
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
51
diff
changeset
|
6 |
# resolve $0 -> bin/update |
28
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
7 |
self=$0 |
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
8 |
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
|
9 |
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
|
10 |
|
2b7aad3466c6
update: log_warn, -q; ensure_dir; link_zone paivola-reverse; indent error exit
Tero Marttila <terom@paivola.fi>
parents:
30
diff
changeset
|
11 |
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
|
12 |
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
|
13 |
else |
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=$(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
|
15 |
fi |
28
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
16 |
done |
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
17 |
|
77
b0c0e3e80c39
update: move zones/serials/dhcp to ./var; requires update -FR and bind/dhcpd config update
Tero Marttila <terom@paivola.fi>
parents:
76
diff
changeset
|
18 |
# root dir |
b0c0e3e80c39
update: move zones/serials/dhcp to ./var; requires update -FR and bind/dhcpd config update
Tero Marttila <terom@paivola.fi>
parents:
76
diff
changeset
|
19 |
ROOT=$(dirname $(dirname $self)) |
2 | 20 |
|
77
b0c0e3e80c39
update: move zones/serials/dhcp to ./var; requires update -FR and bind/dhcpd config update
Tero Marttila <terom@paivola.fi>
parents:
76
diff
changeset
|
21 |
BIN=$ROOT/bin |
b0c0e3e80c39
update: move zones/serials/dhcp to ./var; requires update -FR and bind/dhcpd config update
Tero Marttila <terom@paivola.fi>
parents:
76
diff
changeset
|
22 |
LIB=$ROOT/lib |
b0c0e3e80c39
update: move zones/serials/dhcp to ./var; requires update -FR and bind/dhcpd config update
Tero Marttila <terom@paivola.fi>
parents:
76
diff
changeset
|
23 |
VAR=$ROOT/var |
52
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
51
diff
changeset
|
24 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
51
diff
changeset
|
25 |
## Data paths |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
51
diff
changeset
|
26 |
# absolute path to data files; can be changed using -d |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
51
diff
changeset
|
27 |
ROOT=$(pwd) |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
51
diff
changeset
|
28 |
|
21 | 29 |
DATA=settings |
77
b0c0e3e80c39
update: move zones/serials/dhcp to ./var; requires update -FR and bind/dhcpd config update
Tero Marttila <terom@paivola.fi>
parents:
76
diff
changeset
|
30 |
ZONES=$VAR/zones |
b0c0e3e80c39
update: move zones/serials/dhcp to ./var; requires update -FR and bind/dhcpd config update
Tero Marttila <terom@paivola.fi>
parents:
76
diff
changeset
|
31 |
SERIALS=$VAR/serials |
52
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
51
diff
changeset
|
32 |
|
77
b0c0e3e80c39
update: move zones/serials/dhcp to ./var; requires update -FR and bind/dhcpd config update
Tero Marttila <terom@paivola.fi>
parents:
76
diff
changeset
|
33 |
DHCP=$VAR/dhcp |
61
22b58b938fd0
update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents:
58
diff
changeset
|
34 |
DHCP_DATA=$DATA/dhcp |
62
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
61
diff
changeset
|
35 |
|
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
61
diff
changeset
|
36 |
# global DHCP conf to test |
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
61
diff
changeset
|
37 |
DHCPD=/usr/sbin/dhcpd |
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
61
diff
changeset
|
38 |
DHCPD_CONF=/etc/dhcp/dhcpd.conf |
66
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
64
diff
changeset
|
39 |
DHCPD_INIT=/etc/init.d/isc-dhcp-server |
61
22b58b938fd0
update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents:
58
diff
changeset
|
40 |
|
52
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
51
diff
changeset
|
41 |
# hg repo to commit |
49
755503f6fa93
update: move REPO back to $DATA
Tero Marttila <terom@paivola.fi>
parents:
48
diff
changeset
|
42 |
REPO=$DATA |
2 | 43 |
|
52
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
51
diff
changeset
|
44 |
## Settings used in lib |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
51
diff
changeset
|
45 |
# Hide files under repo in commit diff output.. |
50
fdb9e03e423d
update: hide .serial changes in hg_diff
Tero Marttila <terom@paivola.fi>
parents:
49
diff
changeset
|
46 |
REPO_HIDE='*.serial' |
fdb9e03e423d
update: hide .serial changes in hg_diff
Tero Marttila <terom@paivola.fi>
parents:
49
diff
changeset
|
47 |
|
71
e0576a968171
update: hosts/dhcp files are actually utf-8 now
Tero Marttila <terom@paivola.fi>
parents:
70
diff
changeset
|
48 |
# data input charsets; arguments to ./bin/... python scripts |
e0576a968171
update: hosts/dhcp files are actually utf-8 now
Tero Marttila <terom@paivola.fi>
parents:
70
diff
changeset
|
49 |
HOSTS_FILE_ARGS='--input-charset utf-8' |
e0576a968171
update: hosts/dhcp files are actually utf-8 now
Tero Marttila <terom@paivola.fi>
parents:
70
diff
changeset
|
50 |
DHCP_FILE_ARGS='--input-charset utf-8' |
2 | 51 |
|
52
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
51
diff
changeset
|
52 |
# External bins |
10 | 53 |
NAMED_CHECKZONE=/usr/sbin/named-checkzone |
58 | 54 |
|
31
2b7aad3466c6
update: log_warn, -q; ensure_dir; link_zone paivola-reverse; indent error exit
Tero Marttila <terom@paivola.fi>
parents:
30
diff
changeset
|
55 |
HG=/usr/bin/hg |
58 | 56 |
HG_ARGS=(--config trusted.users=root) |
57 |
||
27 | 58 |
RNDC=/usr/sbin/rndc |
52
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
51
diff
changeset
|
59 |
|
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
51
diff
changeset
|
60 |
# Path to rndc key, must be readable to run.. |
46
3613e93e4fd7
update: rndc: fail if no read perms on $RNDC_KEY
Tero Marttila <terom@paivola.fi>
parents:
45
diff
changeset
|
61 |
RNDC_KEY=/etc/bind/rndc.key |
10 | 62 |
|
52
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
51
diff
changeset
|
63 |
## Library includes |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
51
diff
changeset
|
64 |
# Command-line argument handling |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
51
diff
changeset
|
65 |
source $LIB/update.args |
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
66 |
|
52
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
51
diff
changeset
|
67 |
# Logging |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
51
diff
changeset
|
68 |
source $LIB/update.logging |
36
3208cd6540dc
update: restructure zones/, manage .pvl
Tero Marttila <terom@paivola.fi>
parents:
32
diff
changeset
|
69 |
|
52
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
51
diff
changeset
|
70 |
# Utility functions |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
51
diff
changeset
|
71 |
source $LIB/update.utils |
13 | 72 |
|
52
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
51
diff
changeset
|
73 |
# Dependency-based updates |
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
51
diff
changeset
|
74 |
source $LIB/update.updates |
10 | 75 |
|
54 | 76 |
# Operations; the functions called from run() |
52
b68b8615c512
update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents:
51
diff
changeset
|
77 |
source $LIB/update.operations |
44 | 78 |
|
66
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
64
diff
changeset
|
79 |
## Flags |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
64
diff
changeset
|
80 |
# set by do_reload_zone if zone data has actually been reloaded |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
64
diff
changeset
|
81 |
RELOAD_ZONES= |
21 | 82 |
|
44 | 83 |
## Site settings, used as arguments to scripts |
84 |
# MX record to generate in hosts --forward-zone |
|
75
a5186c5de712
drop --forward-mx from paivola zone; our mailserver isn't set up to handle mail for hosts
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
85 |
FORWARD_MX=mx0 |
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
86 |
|
44 | 87 |
# IP network to generate reverse records for in --reverse-zone |
88 |
REVERSE_ZONE=194.197.235 |
|
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
89 |
|
44 | 90 |
# Origin domain to generate reverse records for in --reverse-zone |
91 |
REVERSE_DOMAIN=paivola.fi |
|
28
647f6de0d0ac
update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents:
27
diff
changeset
|
92 |
|
44 | 93 |
# Views used |
94 |
VIEWS=(internal external) |
|
95 |
||
96 |
# Base domain zone for domains |
|
97 |
DOMAIN_BASE=paivola |
|
98 |
||
99 |
# List of actual domains used; will be linked to $DOMAIN_BASE |
|
100 |
DOMAINS=(paivola.fi paivola.net paivola.org paivola.info paivola.mobi xn--pivl-load8j.fi) |
|
101 |
||
69
88a7683efc54
update: list_files to copy all DHCP_CONFS..
Tero Marttila <terom@paivola.fi>
parents:
66
diff
changeset
|
102 |
# Names of dhcp conf file names |
88a7683efc54
update: list_files to copy all DHCP_CONFS..
Tero Marttila <terom@paivola.fi>
parents:
66
diff
changeset
|
103 |
DHCP_CONFS=( $(list_files $DHCP_DATA *.conf) ) |
54 | 104 |
|
44 | 105 |
## Operate! |
54 | 106 |
# these functions are all defined in lib/update.operations |
62
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
61
diff
changeset
|
107 |
|
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
61
diff
changeset
|
108 |
# Update $ZONES/$DHCP host-files from $DATA |
61
22b58b938fd0
update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents:
58
diff
changeset
|
109 |
function run_hosts { |
44 | 110 |
## Hosts |
27 | 111 |
# test |
13 | 112 |
log "Testing hosts..." |
44 | 113 |
# data args... |
114 |
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
|
115 |
|
27 | 116 |
# update |
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
117 |
log "Generating host zones..." |
44 | 118 |
# hosts data args... |
75
a5186c5de712
drop --forward-mx from paivola zone; our mailserver isn't set up to handle mail for hosts
Tero Marttila <terom@paivola.fi>
parents:
73
diff
changeset
|
119 |
update_hosts $ZONES/hosts/paivola:internal $DATA/paivola.txt --forward-zone --forward-txt |
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
120 |
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
|
121 |
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
|
122 |
|
3208cd6540dc
update: restructure zones/, manage .pvl
Tero Marttila <terom@paivola.fi>
parents:
32
diff
changeset
|
123 |
|
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
124 |
update_hosts $ZONES/hosts/10 $DATA/pvl.txt --reverse-zone 10 --reverse-domain pvl -q |
79 | 125 |
update_hosts $ZONES/hosts/10.0 $DATA/test.pvl.txt --reverse-zone 10.0 --reverse-domain test.pvl -q |
80
b58236f9ea7b
process-zone: support AAAA/ip6.arpa for --reverse-zone, as well as implicit record names
Tero Marttila <terom@paivola.fi>
parents:
79
diff
changeset
|
126 |
update_hosts $ZONES/hosts/fdc4:4cef:395a $DATA/test.pvl.txt --reverse-zone fdc4:4cef:395a --reverse-domain test.pvl -q |
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
127 |
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
|
128 |
|
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
129 |
# 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
|
130 |
# 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
|
131 |
copy_hosts $ZONES/hosts/pvl $DATA/pvl.txt |
79 | 132 |
copy_hosts $ZONES/hosts/test.pvl $DATA/test.pvl.txt |
61
22b58b938fd0
update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents:
58
diff
changeset
|
133 |
} |
62
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
61
diff
changeset
|
134 |
|
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
61
diff
changeset
|
135 |
# Update $ZONES files |
61
22b58b938fd0
update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents:
58
diff
changeset
|
136 |
function run_zones { |
44 | 137 |
## Includes |
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
138 |
log "Copying zone includes..." |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
139 |
# view zone base |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
140 |
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
|
141 |
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
|
142 |
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
|
143 |
copy_zone includes paivola.services paivola.zone.services |
76
7da14a2549f7
update: add paivola.aux include
Tero Marttila <terom@paivola.fi>
parents:
75
diff
changeset
|
144 |
copy_zone includes paivola.aux paivola.zone.aux |
2 | 145 |
|
44 | 146 |
## Serials |
42
ef5bcc4145de
debug with func_caller; update_serial deps
Tero Marttila <terom@paivola.fi>
parents:
41
diff
changeset
|
147 |
log "Updating serials..." |
18
826103fe3c8c
update: abspath; fixup serials log; indent log_cmd
Tero Marttila <terom@paivola.fi>
parents:
17
diff
changeset
|
148 |
|
44 | 149 |
# zone deps... |
45
3d6bf3864d8a
update: tidy up run update_serials
Tero Marttila <terom@paivola.fi>
parents:
44
diff
changeset
|
150 |
# includes... |
3d6bf3864d8a
update: tidy up run update_serials
Tero Marttila <terom@paivola.fi>
parents:
44
diff
changeset
|
151 |
update_serial pvl $ZONES/hosts/pvl $DATA/pvl.zone |
79 | 152 |
update_serial test.pvl $ZONES/hosts/test.pvl $DATA/test.pvl.zone |
45
3d6bf3864d8a
update: tidy up run update_serials
Tero Marttila <terom@paivola.fi>
parents:
44
diff
changeset
|
153 |
update_serial 10 $ZONES/hosts/10 $DATA/10.zone |
79 | 154 |
update_serial 10.0 $ZONES/hosts/10.0 $DATA/10.0.zone |
155 |
update_serial fdc4:4cef:395a $ZONES/hosts/fdc4:4cef:395a $DATA/fdc4:4cef:395a.zone |
|
45
3d6bf3864d8a
update: tidy up run update_serials
Tero Marttila <terom@paivola.fi>
parents:
44
diff
changeset
|
156 |
update_serial 192.168 $ZONES/hosts/192.168 $DATA/192.168.zone |
36
3208cd6540dc
update: restructure zones/, manage .pvl
Tero Marttila <terom@paivola.fi>
parents:
32
diff
changeset
|
157 |
|
45
3d6bf3864d8a
update: tidy up run update_serials
Tero Marttila <terom@paivola.fi>
parents:
44
diff
changeset
|
158 |
update_serial paivola $ZONES/hosts/paivola:* $DATA/paivola.zone \ |
44 | 159 |
$ZONES/includes/paivola:* \ |
160 |
$ZONES/includes/paivola.* |
|
42
ef5bcc4145de
debug with func_caller; update_serial deps
Tero Marttila <terom@paivola.fi>
parents:
41
diff
changeset
|
161 |
|
45
3d6bf3864d8a
update: tidy up run update_serials
Tero Marttila <terom@paivola.fi>
parents:
44
diff
changeset
|
162 |
update_serial 194.197.235 $ZONES/hosts/194.197.235 $DATA/194.197.235.zone |
13 | 163 |
|
44 | 164 |
## Zones |
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
165 |
log "Updating zones..." |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
166 |
# view zone base |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
167 |
update_zone internal pvl |
79 | 168 |
update_zone internal test.pvl |
10 | 169 |
|
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
170 |
update_zone internal 10 |
79 | 171 |
update_zone internal 10.0 |
172 |
update_zone internal fdc4:4cef:395a |
|
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
173 |
update_zone internal 192.168 |
36
3208cd6540dc
update: restructure zones/, manage .pvl
Tero Marttila <terom@paivola.fi>
parents:
32
diff
changeset
|
174 |
|
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
175 |
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
|
176 |
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
|
177 |
link_zone external 194.197.235 |
36
3208cd6540dc
update: restructure zones/, manage .pvl
Tero Marttila <terom@paivola.fi>
parents:
32
diff
changeset
|
178 |
|
44 | 179 |
## Test |
10 | 180 |
log "Testing zones..." |
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
181 |
# view zone origin |
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
182 |
check_zone internal 10 10.in-addr.arpa |
79 | 183 |
check_zone internal 10.0 0.10.in-addr.arpa |
184 |
check_zone internal fdc4:4cef:395a a.5.9.3.f.e.c.4.4.c.d.f.ip6.arpa |
|
185 |
||
38
39799fc994e9
update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents:
37
diff
changeset
|
186 |
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
|
187 |
check_zone common 194.197.235 235.197.194.in-addr.arpa |
10 | 188 |
|
44 | 189 |
## Domains... |
190 |
log "Linking domains..." |
|
191 |
for view in "${VIEWS[@]}"; do |
|
192 |
for zone in "${DOMAINS[@]}"; do |
|
73
dcb432cfeacc
update: generate all domain-zones using update_zone from either settings/paivola.*.zone or settings/paivola.zone instead of linking them all to paivola; different domains may now use their own zones if required
Tero Marttila <terom@paivola.fi>
parents:
71
diff
changeset
|
193 |
# choose input .zone to use |
dcb432cfeacc
update: generate all domain-zones using update_zone from either settings/paivola.*.zone or settings/paivola.zone instead of linking them all to paivola; different domains may now use their own zones if required
Tero Marttila <terom@paivola.fi>
parents:
71
diff
changeset
|
194 |
base=$(choose_zone $zone $DOMAIN_BASE) |
dcb432cfeacc
update: generate all domain-zones using update_zone from either settings/paivola.*.zone or settings/paivola.zone instead of linking them all to paivola; different domains may now use their own zones if required
Tero Marttila <terom@paivola.fi>
parents:
71
diff
changeset
|
195 |
|
dcb432cfeacc
update: generate all domain-zones using update_zone from either settings/paivola.*.zone or settings/paivola.zone instead of linking them all to paivola; different domains may now use their own zones if required
Tero Marttila <terom@paivola.fi>
parents:
71
diff
changeset
|
196 |
if [ $base != $DOMAIN_BASE ]; then |
dcb432cfeacc
update: generate all domain-zones using update_zone from either settings/paivola.*.zone or settings/paivola.zone instead of linking them all to paivola; different domains may now use their own zones if required
Tero Marttila <terom@paivola.fi>
parents:
71
diff
changeset
|
197 |
# serial |
dcb432cfeacc
update: generate all domain-zones using update_zone from either settings/paivola.*.zone or settings/paivola.zone instead of linking them all to paivola; different domains may now use their own zones if required
Tero Marttila <terom@paivola.fi>
parents:
71
diff
changeset
|
198 |
# XXX: not all zones use all these includes? |
dcb432cfeacc
update: generate all domain-zones using update_zone from either settings/paivola.*.zone or settings/paivola.zone instead of linking them all to paivola; different domains may now use their own zones if required
Tero Marttila <terom@paivola.fi>
parents:
71
diff
changeset
|
199 |
update_serial $base $DATA/$base.zone \ |
dcb432cfeacc
update: generate all domain-zones using update_zone from either settings/paivola.*.zone or settings/paivola.zone instead of linking them all to paivola; different domains may now use their own zones if required
Tero Marttila <terom@paivola.fi>
parents:
71
diff
changeset
|
200 |
$ZONES/hosts/paivola:* \ |
dcb432cfeacc
update: generate all domain-zones using update_zone from either settings/paivola.*.zone or settings/paivola.zone instead of linking them all to paivola; different domains may now use their own zones if required
Tero Marttila <terom@paivola.fi>
parents:
71
diff
changeset
|
201 |
$ZONES/includes/paivola:* \ |
dcb432cfeacc
update: generate all domain-zones using update_zone from either settings/paivola.*.zone or settings/paivola.zone instead of linking them all to paivola; different domains may now use their own zones if required
Tero Marttila <terom@paivola.fi>
parents:
71
diff
changeset
|
202 |
$ZONES/includes/paivola.* |
dcb432cfeacc
update: generate all domain-zones using update_zone from either settings/paivola.*.zone or settings/paivola.zone instead of linking them all to paivola; different domains may now use their own zones if required
Tero Marttila <terom@paivola.fi>
parents:
71
diff
changeset
|
203 |
fi |
dcb432cfeacc
update: generate all domain-zones using update_zone from either settings/paivola.*.zone or settings/paivola.zone instead of linking them all to paivola; different domains may now use their own zones if required
Tero Marttila <terom@paivola.fi>
parents:
71
diff
changeset
|
204 |
|
44 | 205 |
# link |
73
dcb432cfeacc
update: generate all domain-zones using update_zone from either settings/paivola.*.zone or settings/paivola.zone instead of linking them all to paivola; different domains may now use their own zones if required
Tero Marttila <terom@paivola.fi>
parents:
71
diff
changeset
|
206 |
update_zone $view $zone $base |
30
1a8bc67b1eb7
update: link_zones for paivola.*.zone -> paivola.zone
Tero Marttila <terom@paivola.fi>
parents:
29
diff
changeset
|
207 |
|
44 | 208 |
# test |
209 |
check_zone $view $zone $zone |
|
210 |
done |
|
30
1a8bc67b1eb7
update: link_zones for paivola.*.zone -> paivola.zone
Tero Marttila <terom@paivola.fi>
parents:
29
diff
changeset
|
211 |
done |
61
22b58b938fd0
update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents:
58
diff
changeset
|
212 |
} |
44 | 213 |
|
62
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
61
diff
changeset
|
214 |
# Update $DHCP files from $DATA/dhcp |
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
61
diff
changeset
|
215 |
function run_dhcp { |
69
88a7683efc54
update: list_files to copy all DHCP_CONFS..
Tero Marttila <terom@paivola.fi>
parents:
66
diff
changeset
|
216 |
log_debug "DHCP_CONFS: ${DHCP_CONFS[*]}" |
88a7683efc54
update: list_files to copy all DHCP_CONFS..
Tero Marttila <terom@paivola.fi>
parents:
66
diff
changeset
|
217 |
|
64
620f4594a09d
update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents:
63
diff
changeset
|
218 |
log "Copying DHCP configs..." |
63
a88766722d18
update: rename dhcp hosts -> dhcp conf, makes more sense; check input files before linking
Tero Marttila <terom@paivola.fi>
parents:
62
diff
changeset
|
219 |
for conf in "${DHCP_CONFS[@]}"; do |
70
68b67c7f2dd1
disable check_dhcp_conf check before copying; doesn't work because of includes
Tero Marttila <terom@paivola.fi>
parents:
69
diff
changeset
|
220 |
# XXX: ei toimi, koska conf:it riippuu toisistaan include:ien takia |
68b67c7f2dd1
disable check_dhcp_conf check before copying; doesn't work because of includes
Tero Marttila <terom@paivola.fi>
parents:
69
diff
changeset
|
221 |
# check_dhcp_conf $conf |
68b67c7f2dd1
disable check_dhcp_conf check before copying; doesn't work because of includes
Tero Marttila <terom@paivola.fi>
parents:
69
diff
changeset
|
222 |
|
63
a88766722d18
update: rename dhcp hosts -> dhcp conf, makes more sense; check input files before linking
Tero Marttila <terom@paivola.fi>
parents:
62
diff
changeset
|
223 |
# conf base |
64
620f4594a09d
update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents:
63
diff
changeset
|
224 |
copy_dhcp_conf $conf |
62
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
61
diff
changeset
|
225 |
done |
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
61
diff
changeset
|
226 |
|
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
61
diff
changeset
|
227 |
log "Testing dhcp..." |
70
68b67c7f2dd1
disable check_dhcp_conf check before copying; doesn't work because of includes
Tero Marttila <terom@paivola.fi>
parents:
69
diff
changeset
|
228 |
# checks the whole dhcpd.conf, with all includes.. |
62
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
61
diff
changeset
|
229 |
check_dhcp |
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
61
diff
changeset
|
230 |
} |
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
61
diff
changeset
|
231 |
|
66
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
64
diff
changeset
|
232 |
# Runs DHCP checks, once DNS hosts have been updated |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
64
diff
changeset
|
233 |
function run_dhcp_check { |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
64
diff
changeset
|
234 |
log "Testing dhcp hosts..." |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
64
diff
changeset
|
235 |
for conf in "${DHCP_CONFS[@]}"; do |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
64
diff
changeset
|
236 |
check_dhcp_hosts $DHCP/$conf.conf |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
64
diff
changeset
|
237 |
done |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
64
diff
changeset
|
238 |
} |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
64
diff
changeset
|
239 |
|
61
22b58b938fd0
update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents:
58
diff
changeset
|
240 |
function run_deploy { |
22b58b938fd0
update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents:
58
diff
changeset
|
241 |
## Reload zones |
22b58b938fd0
update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents:
58
diff
changeset
|
242 |
log "Reload zones..." |
22b58b938fd0
update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents:
58
diff
changeset
|
243 |
reload_zones |
44 | 244 |
|
66
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
64
diff
changeset
|
245 |
## DHCP |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
64
diff
changeset
|
246 |
run_dhcp_check |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
64
diff
changeset
|
247 |
|
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
64
diff
changeset
|
248 |
log "Reload dhcp..." |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
64
diff
changeset
|
249 |
reload_dhcp |
482d06935d96
update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents:
64
diff
changeset
|
250 |
|
44 | 251 |
## Commit |
252 |
log "Commit data..." |
|
253 |
commit_data |
|
254 |
} |
|
255 |
||
256 |
## Main entry point |
|
257 |
function main { |
|
258 |
# test tty |
|
259 |
[ -t 1 ] && IS_TTY=y |
|
260 |
||
261 |
parse_args "$@" |
|
262 |
||
62
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
61
diff
changeset
|
263 |
## Input dirs |
44 | 264 |
[ -d $ROOT/$DATA ] || die "Missing data: $ROOT/$DATA" |
265 |
||
266 |
## Output dirs |
|
77
b0c0e3e80c39
update: move zones/serials/dhcp to ./var; requires update -FR and bind/dhcpd config update
Tero Marttila <terom@paivola.fi>
parents:
76
diff
changeset
|
267 |
for dir in $VAR $DHCP $ZONES $SERIALS; do |
62
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
61
diff
changeset
|
268 |
ensure_dir $dir |
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
61
diff
changeset
|
269 |
done |
77
b0c0e3e80c39
update: move zones/serials/dhcp to ./var; requires update -FR and bind/dhcpd config update
Tero Marttila <terom@paivola.fi>
parents:
76
diff
changeset
|
270 |
|
b0c0e3e80c39
update: move zones/serials/dhcp to ./var; requires update -FR and bind/dhcpd config update
Tero Marttila <terom@paivola.fi>
parents:
76
diff
changeset
|
271 |
# sub-$ZONES |
44 | 272 |
for dir in "common" "hosts" "includes" "${VIEWS[@]}"; do |
62
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
61
diff
changeset
|
273 |
ensure_dir $ZONES/$dir |
30
1a8bc67b1eb7
update: link_zones for paivola.*.zone -> paivola.zone
Tero Marttila <terom@paivola.fi>
parents:
29
diff
changeset
|
274 |
done |
1a8bc67b1eb7
update: link_zones for paivola.*.zone -> paivola.zone
Tero Marttila <terom@paivola.fi>
parents:
29
diff
changeset
|
275 |
|
44 | 276 |
## Go |
61
22b58b938fd0
update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents:
58
diff
changeset
|
277 |
run_hosts |
22b58b938fd0
update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents:
58
diff
changeset
|
278 |
run_zones |
62
65bf391fd2f3
update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents:
61
diff
changeset
|
279 |
run_dhcp |
61
22b58b938fd0
update: rename deploy_zones -> reload_zones; move related do_* from lib/update.updates -> lib/update.operations where they belong
Tero Marttila <terom@paivola.fi>
parents:
58
diff
changeset
|
280 |
run_deploy |
2 | 281 |
} |
282 |
||
7
f4457348faa0
update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents:
2
diff
changeset
|
283 |
main "$@" |