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