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