bin/update
author Tero Marttila <terom@paivola.fi>
Fri, 23 Mar 2012 15:15:22 +0200
changeset 70 68b67c7f2dd1
parent 69 88a7683efc54
child 71 e0576a968171
permissions -rwxr-xr-x
disable check_dhcp_conf check before copying; doesn't work because of includes
2
aeb106b9487c update: update zonefiles
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
     1
#!/bin/bash
aeb106b9487c update: update zonefiles
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
     2
# vim: set ft=sh :
aeb106b9487c update: update zonefiles
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
     3
aeb106b9487c update: update zonefiles
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
     4
set -ue
aeb106b9487c update: update zonefiles
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
     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
44
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
    18
# Our bin dir, with scripts
28
647f6de0d0ac update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents: 27
diff changeset
    19
BIN=$(dirname $self)
2
aeb106b9487c update: update zonefiles
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    20
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents: 51
diff changeset
    21
# code root
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents: 51
diff changeset
    22
CODE=$(dirname $BIN)
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents: 51
diff changeset
    23
54
b474e2e6f54e update: docdoc
Tero Marttila <terom@paivola.fi>
parents: 52
diff changeset
    24
# library code
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents: 51
diff changeset
    25
LIB=$CODE/lib
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents: 51
diff changeset
    26
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents: 51
diff changeset
    27
## Data paths
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents: 51
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: 51
diff changeset
    29
ROOT=$(pwd)
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents: 51
diff changeset
    30
21
81cd07bc5f76 update: commit
Tero Marttila <terom@paivola.fi>
parents: 19
diff changeset
    31
DATA=settings
7
f4457348faa0 update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents: 2
diff changeset
    32
ZONES=zones
21
81cd07bc5f76 update: commit
Tero Marttila <terom@paivola.fi>
parents: 19
diff changeset
    33
SERIALS=$DATA
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents: 51
diff changeset
    34
62
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
    35
DHCP=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
    36
DHCP_DATA=$DATA/dhcp
62
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
    37
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
    38
# global DHCP conf to test
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
    39
DHCPD=/usr/sbin/dhcpd
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
    40
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
    41
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
    42
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents: 51
diff changeset
    43
# hg repo to commit
49
755503f6fa93 update: move REPO back to $DATA
Tero Marttila <terom@paivola.fi>
parents: 48
diff changeset
    44
REPO=$DATA
2
aeb106b9487c update: update zonefiles
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    45
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents: 51
diff changeset
    46
## Settings used in lib
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents: 51
diff changeset
    47
# 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
    48
REPO_HIDE='*.serial'
fdb9e03e423d update: hide .serial changes in hg_diff
Tero Marttila <terom@paivola.fi>
parents: 49
diff changeset
    49
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents: 51
diff changeset
    50
# XXX: hosts data input charset?
2
aeb106b9487c update: update zonefiles
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    51
PROCESS_ARGS='--input-charset latin-1'
66
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
    52
DHCP_FILE_ARGS='--input-charset latin-1'
2
aeb106b9487c update: update zonefiles
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    53
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents: 51
diff changeset
    54
# External bins
10
26e789db3f72 update: named-checkzone
Tero Marttila <terom@paivola.fi>
parents: 9
diff changeset
    55
NAMED_CHECKZONE=/usr/sbin/named-checkzone
58
6292cb597954 update: hg trust root
Tero Marttila <terom@paivola.fi>
parents: 54
diff changeset
    56
31
2b7aad3466c6 update: log_warn, -q; ensure_dir; link_zone paivola-reverse; indent error exit
Tero Marttila <terom@paivola.fi>
parents: 30
diff changeset
    57
HG=/usr/bin/hg
58
6292cb597954 update: hg trust root
Tero Marttila <terom@paivola.fi>
parents: 54
diff changeset
    58
HG_ARGS=(--config trusted.users=root)
6292cb597954 update: hg trust root
Tero Marttila <terom@paivola.fi>
parents: 54
diff changeset
    59
27
773c91a7547a update: deploy_zones
Tero Marttila <terom@paivola.fi>
parents: 26
diff changeset
    60
RNDC=/usr/sbin/rndc
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents: 51
diff changeset
    61
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents: 51
diff changeset
    62
# 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
    63
RNDC_KEY=/etc/bind/rndc.key
10
26e789db3f72 update: named-checkzone
Tero Marttila <terom@paivola.fi>
parents: 9
diff changeset
    64
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents: 51
diff changeset
    65
## Library includes
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents: 51
diff changeset
    66
# Command-line argument handling
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents: 51
diff changeset
    67
source $LIB/update.args
7
f4457348faa0 update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents: 2
diff changeset
    68
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents: 51
diff changeset
    69
# Logging
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents: 51
diff changeset
    70
source $LIB/update.logging
36
3208cd6540dc update: restructure zones/, manage .pvl
Tero Marttila <terom@paivola.fi>
parents: 32
diff changeset
    71
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents: 51
diff changeset
    72
# Utility functions
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents: 51
diff changeset
    73
source $LIB/update.utils
13
7d02a07e0354 update: check_hosts
Tero Marttila <terom@paivola.fi>
parents: 10
diff changeset
    74
52
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents: 51
diff changeset
    75
# Dependency-based updates
b68b8615c512 update: split out code into lib/update.foo
Tero Marttila <terom@paivola.fi>
parents: 51
diff changeset
    76
source $LIB/update.updates
10
26e789db3f72 update: named-checkzone
Tero Marttila <terom@paivola.fi>
parents: 9
diff changeset
    77
54
b474e2e6f54e update: docdoc
Tero Marttila <terom@paivola.fi>
parents: 52
diff changeset
    78
# 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
    79
source $LIB/update.operations
44
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
    80
66
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
    81
## Flags
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
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: 64
diff changeset
    83
RELOAD_ZONES=
21
81cd07bc5f76 update: commit
Tero Marttila <terom@paivola.fi>
parents: 19
diff changeset
    84
44
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
    85
## Site settings, used as arguments to scripts
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
    86
# MX record to generate in hosts --forward-zone
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
    87
FORWARD_MX=mail
7
f4457348faa0 update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents: 2
diff changeset
    88
44
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
    89
# IP network to generate reverse records for in --reverse-zone
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
    90
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
    91
44
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
    92
# Origin domain to generate reverse records for in --reverse-zone
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
    93
REVERSE_DOMAIN=paivola.fi
28
647f6de0d0ac update: implement -d for $ROOT
Tero Marttila <terom@paivola.fi>
parents: 27
diff changeset
    94
44
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
    95
# Views used
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
    96
VIEWS=(internal external)
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
    97
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
    98
# Base domain zone for domains
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
    99
DOMAIN_BASE=paivola
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   100
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   101
# List of actual domains used; will be linked to $DOMAIN_BASE
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   102
DOMAINS=(paivola.fi paivola.net paivola.org paivola.info paivola.mobi xn--pivl-load8j.fi)
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   103
69
88a7683efc54 update: list_files to copy all DHCP_CONFS..
Tero Marttila <terom@paivola.fi>
parents: 66
diff changeset
   104
# Names of dhcp conf file names
88a7683efc54 update: list_files to copy all DHCP_CONFS..
Tero Marttila <terom@paivola.fi>
parents: 66
diff changeset
   105
DHCP_CONFS=( $(list_files $DHCP_DATA *.conf) )
54
b474e2e6f54e update: docdoc
Tero Marttila <terom@paivola.fi>
parents: 52
diff changeset
   106
44
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   107
## Operate!
54
b474e2e6f54e update: docdoc
Tero Marttila <terom@paivola.fi>
parents: 52
diff changeset
   108
# 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
   109
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   110
# 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
   111
function run_hosts {
44
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   112
    ## Hosts
27
773c91a7547a update: deploy_zones
Tero Marttila <terom@paivola.fi>
parents: 26
diff changeset
   113
    # test
13
7d02a07e0354 update: check_hosts
Tero Marttila <terom@paivola.fi>
parents: 10
diff changeset
   114
    log "Testing hosts..."
44
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   115
        #                   data                            args...
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   116
        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
   117
27
773c91a7547a update: deploy_zones
Tero Marttila <terom@paivola.fi>
parents: 26
diff changeset
   118
    # update
7
f4457348faa0 update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents: 2
diff changeset
   119
    log "Generating host zones..."
44
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   120
        #                   hosts                           data                args...
38
39799fc994e9 update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents: 37
diff changeset
   121
        update_hosts        $ZONES/hosts/paivola:internal   $DATA/paivola.txt   --forward-zone --forward-txt --forward-mx $FORWARD_MX
39799fc994e9 update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents: 37
diff changeset
   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: 37
diff changeset
   123
        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
   124
3208cd6540dc update: restructure zones/, manage .pvl
Tero Marttila <terom@paivola.fi>
parents: 32
diff changeset
   125
        
38
39799fc994e9 update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents: 37
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: 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
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
   132
}
62
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   133
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   134
# 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
   135
function run_zones {
44
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   136
    ## Includes
38
39799fc994e9 update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents: 37
diff changeset
   137
    log "Copying zone includes..."
39799fc994e9 update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents: 37
diff changeset
   138
        #                   view            zone                    base
39799fc994e9 update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents: 37
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: 37
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: 37
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: 37
diff changeset
   142
        copy_zone           includes        paivola.services        paivola.zone.services
2
aeb106b9487c update: update zonefiles
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   143
44
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   144
    ## Serials
42
ef5bcc4145de debug with func_caller; update_serial deps
Tero Marttila <terom@paivola.fi>
parents: 41
diff changeset
   145
    log "Updating serials..."
18
826103fe3c8c update: abspath; fixup serials log; indent log_cmd
Tero Marttila <terom@paivola.fi>
parents: 17
diff changeset
   146
44
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   147
        #                   zone            deps...
45
3d6bf3864d8a update: tidy up run update_serials
Tero Marttila <terom@paivola.fi>
parents: 44
diff changeset
   148
        #   includes...
3d6bf3864d8a update: tidy up run update_serials
Tero Marttila <terom@paivola.fi>
parents: 44
diff changeset
   149
        update_serial       pvl             $ZONES/hosts/pvl            $DATA/pvl.zone
3d6bf3864d8a update: tidy up run update_serials
Tero Marttila <terom@paivola.fi>
parents: 44
diff changeset
   150
        update_serial       10              $ZONES/hosts/10             $DATA/10.zone
3d6bf3864d8a update: tidy up run update_serials
Tero Marttila <terom@paivola.fi>
parents: 44
diff changeset
   151
        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
   152
45
3d6bf3864d8a update: tidy up run update_serials
Tero Marttila <terom@paivola.fi>
parents: 44
diff changeset
   153
        update_serial       paivola         $ZONES/hosts/paivola:*      $DATA/paivola.zone          \
44
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   154
            $ZONES/includes/paivola:*       \
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   155
            $ZONES/includes/paivola.*
42
ef5bcc4145de debug with func_caller; update_serial deps
Tero Marttila <terom@paivola.fi>
parents: 41
diff changeset
   156
45
3d6bf3864d8a update: tidy up run update_serials
Tero Marttila <terom@paivola.fi>
parents: 44
diff changeset
   157
        update_serial       194.197.235     $ZONES/hosts/194.197.235    $DATA/194.197.235.zone          
13
7d02a07e0354 update: check_hosts
Tero Marttila <terom@paivola.fi>
parents: 10
diff changeset
   158
44
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   159
    ## Zones
38
39799fc994e9 update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents: 37
diff changeset
   160
    log "Updating zones..."
39799fc994e9 update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents: 37
diff changeset
   161
        #                   view        zone            base
39799fc994e9 update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents: 37
diff changeset
   162
        update_zone         internal    pvl
39799fc994e9 update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents: 37
diff changeset
   163
        update_zone         internal    paivola
39799fc994e9 update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents: 37
diff changeset
   164
        update_zone         external    paivola
10
26e789db3f72 update: named-checkzone
Tero Marttila <terom@paivola.fi>
parents: 9
diff changeset
   165
38
39799fc994e9 update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents: 37
diff changeset
   166
        update_zone         internal    10
39799fc994e9 update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents: 37
diff changeset
   167
        update_zone         internal    192.168
36
3208cd6540dc update: restructure zones/, manage .pvl
Tero Marttila <terom@paivola.fi>
parents: 32
diff changeset
   168
38
39799fc994e9 update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents: 37
diff changeset
   169
        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
   170
        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
   171
        link_zone           external    194.197.235
36
3208cd6540dc update: restructure zones/, manage .pvl
Tero Marttila <terom@paivola.fi>
parents: 32
diff changeset
   172
44
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   173
    ## Test
10
26e789db3f72 update: named-checkzone
Tero Marttila <terom@paivola.fi>
parents: 9
diff changeset
   174
    log "Testing zones..."
38
39799fc994e9 update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents: 37
diff changeset
   175
        #                   view        zone            origin
39799fc994e9 update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents: 37
diff changeset
   176
        check_zone          internal    paivola         paivola.fi
39799fc994e9 update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents: 37
diff changeset
   177
        check_zone          external    paivola         paivola.fi
36
3208cd6540dc update: restructure zones/, manage .pvl
Tero Marttila <terom@paivola.fi>
parents: 32
diff changeset
   178
38
39799fc994e9 update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents: 37
diff changeset
   179
        check_zone          internal    10              10.in-addr.arpa
39799fc994e9 update: unify [check/copy/update/link]_[hosts/zone/serial]
Tero Marttila <terom@paivola.fi>
parents: 37
diff changeset
   180
        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
   181
        check_zone          common      194.197.235     235.197.194.in-addr.arpa
10
26e789db3f72 update: named-checkzone
Tero Marttila <terom@paivola.fi>
parents: 9
diff changeset
   182
44
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   183
    ## Domains...
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   184
    log "Linking domains..."
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   185
        for view in "${VIEWS[@]}"; do
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   186
            for zone in "${DOMAINS[@]}"; do
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   187
                # link
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   188
                link_zone       $view       $zone           $DOMAIN_BASE
30
1a8bc67b1eb7 update: link_zones for paivola.*.zone -> paivola.zone
Tero Marttila <terom@paivola.fi>
parents: 29
diff changeset
   189
44
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   190
                # test
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   191
                check_zone      $view       $zone           $zone
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   192
            done
30
1a8bc67b1eb7 update: link_zones for paivola.*.zone -> paivola.zone
Tero Marttila <terom@paivola.fi>
parents: 29
diff changeset
   193
        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
   194
}
44
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   195
62
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   196
# 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
   197
function run_dhcp {
69
88a7683efc54 update: list_files to copy all DHCP_CONFS..
Tero Marttila <terom@paivola.fi>
parents: 66
diff changeset
   198
    log_debug "DHCP_CONFS: ${DHCP_CONFS[*]}"
88a7683efc54 update: list_files to copy all DHCP_CONFS..
Tero Marttila <terom@paivola.fi>
parents: 66
diff changeset
   199
64
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
   200
    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
   201
        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
   202
            # 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
   203
            # 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
   204
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
   205
            #                   conf               base
64
620f4594a09d update: copy_generic; use copy_dhcp_conf to get diffs
Tero Marttila <terom@paivola.fi>
parents: 63
diff changeset
   206
            copy_dhcp_conf      $conf
62
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   207
        done
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   208
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   209
    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
   210
        # 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
   211
        check_dhcp
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   212
}
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   213
66
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   214
# 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
   215
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
   216
    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
   217
        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
   218
            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
   219
        done
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   220
}
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   221
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
   222
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
   223
    ## 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
   224
    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
   225
        reload_zones
44
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   226
66
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   227
    ## DHCP
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   228
    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
   229
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   230
    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
   231
        reload_dhcp
482d06935d96 update: cmd_test; check_dhcp_hosts after do_reload_zones; reload_dhcp
Tero Marttila <terom@paivola.fi>
parents: 64
diff changeset
   232
44
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   233
    ## Commit
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   234
    log "Commit data..."
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   235
        commit_data
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   236
}
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   237
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   238
## Main entry point
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   239
function main {
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   240
    # test tty
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   241
    [ -t 1 ] && IS_TTY=y
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   242
    
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   243
    parse_args "$@"
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   244
62
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   245
    ## Input dirs
44
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   246
    [ -d $ROOT/$DATA ] || die "Missing data: $ROOT/$DATA"
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   247
    
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   248
    ## Output dirs
62
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   249
    for dir in $DHCP $ZONES; do
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   250
        ensure_dir  $dir
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   251
    done
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   252
44
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   253
    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
   254
        ensure_dir  $ZONES/$dir
30
1a8bc67b1eb7 update: link_zones for paivola.*.zone -> paivola.zone
Tero Marttila <terom@paivola.fi>
parents: 29
diff changeset
   255
    done
1a8bc67b1eb7 update: link_zones for paivola.*.zone -> paivola.zone
Tero Marttila <terom@paivola.fi>
parents: 29
diff changeset
   256
44
8f49e2f51c0d update: cleanup, docs
Tero Marttila <terom@paivola.fi>
parents: 43
diff changeset
   257
    ## 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
   258
    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
   259
    run_zones
62
65bf391fd2f3 update: link + check dhcpd hosts from settings/dhcp/... -> dhcp/...
Tero Marttila <terom@paivola.fi>
parents: 61
diff changeset
   260
    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
   261
    run_deploy
2
aeb106b9487c update: update zonefiles
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   262
}
aeb106b9487c update: update zonefiles
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   263
7
f4457348faa0 update: function update { ... }, color logging, update_serial
Tero Marttila <terom@paivola.fi>
parents: 2
diff changeset
   264
main "$@"