lib/pvl/hosts/zone.sh
author Tero Marttila <tero.marttila@aalto.fi>
Tue, 03 Mar 2015 12:09:22 +0200
changeset 715 76ed62924d50
parent 712 97fa1b086b36
child 720 0b2174b11897
permissions -rw-r--r--
lib/pvl/hosts: include cache for proper hosts dependencies
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
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    54
function update_zone_include {
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    55
    local out="$1"
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    56
    local src="$2"
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    57
    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
    58
651
599dc457c590 lib/pvl/hosts: fix update_zone and update_zone_include
Tero Marttila <tero.marttila@aalto.fi>
parents: 648
diff changeset
    59
    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
    60
        log_skip "$msg"
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    61
    else
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    62
        log_apply "$msg"
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    63
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    64
        apply_cmd "$out" cat \
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    65
            "$src"
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    66
    fi
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
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    69
648
8e3e6be9ac70 bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents: 643
diff changeset
    70
## Update list of zone $INCLUDEs from zone file
8e3e6be9ac70 bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents: 643
diff changeset
    71
#
8e3e6be9ac70 bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents: 643
diff changeset
    72
#   update_zone_includes var/include-cache/$zone etc/zones/$zone
8e3e6be9ac70 bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents: 643
diff changeset
    73
#
8e3e6be9ac70 bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents: 643
diff changeset
    74
function update_zone_includes {
8e3e6be9ac70 bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents: 643
diff changeset
    75
    local out="$1"
628
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    76
    local src="$2"
648
8e3e6be9ac70 bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents: 643
diff changeset
    77
    local includes="$ZONES_INCLUDE"
628
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    78
648
8e3e6be9ac70 bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents: 643
diff changeset
    79
    if [ "$UPDATE_INCLUDES" = 1 ]; then
8e3e6be9ac70 bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents: 643
diff changeset
    80
        log_force "$out: Force zone includes: $src"
8e3e6be9ac70 bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents: 643
diff changeset
    81
    
8e3e6be9ac70 bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents: 643
diff changeset
    82
    elif apply_check "$out" "$src"; then
8e3e6be9ac70 bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents: 643
diff changeset
    83
        log_skip "$out: Skip zone includes: $src"
8e3e6be9ac70 bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents: 643
diff changeset
    84
        
8e3e6be9ac70 bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents: 643
diff changeset
    85
        return
8e3e6be9ac70 bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents: 643
diff changeset
    86
8e3e6be9ac70 bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents: 643
diff changeset
    87
    elif [ "$UPDATE_INCLUDES" = 0 ]; then
8e3e6be9ac70 bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents: 643
diff changeset
    88
        log_noop "$out: Noop zone includes: $src"
8e3e6be9ac70 bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents: 643
diff changeset
    89
        
8e3e6be9ac70 bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents: 643
diff changeset
    90
        return
8e3e6be9ac70 bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents: 643
diff changeset
    91
    else
8e3e6be9ac70 bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents: 643
diff changeset
    92
        log_apply "$out: Update zone includes: $src"
628
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    93
    fi
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    94
648
8e3e6be9ac70 bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents: 643
diff changeset
    95
    apply_cmd "$out" $OPT/bin/pvl.dns-includes \
8e3e6be9ac70 bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents: 643
diff changeset
    96
            --include-path=$ZONES_INCLUDE \
8e3e6be9ac70 bin/pvl.dns-includes
Tero Marttila <tero.marttila@aalto.fi>
parents: 643
diff changeset
    97
            "$src"
628
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    98
}
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    99
643
eda838f84366 update: use pvl.dns-process for update_zone
Tero Marttila <tero.marttila@aalto.fi>
parents: 632
diff changeset
   100
## Update the cached .serial for the given zone, if the zone has changed:
628
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   101
#
643
eda838f84366 update: use pvl.dns-process for update_zone
Tero Marttila <tero.marttila@aalto.fi>
parents: 632
diff changeset
   102
#   update_serial var/serials/$zone $serial $deps...
628
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   103
#
643
eda838f84366 update: use pvl.dns-process for update_zone
Tero Marttila <tero.marttila@aalto.fi>
parents: 632
diff changeset
   104
# Supports UPDATE_SERIAL=
628
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   105
function update_zone_serial {
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   106
    local out="$1"
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   107
    local serial="$2"
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   108
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   109
    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
   110
    
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   111
    # test
629
7214fe5c6fac lib/pvl: fixfix
Tero Marttila <tero.marttila@aalto.fi>
parents: 628
diff changeset
   112
    if [ "$UPDATE_SERIAL" = 1 ]; then
628
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   113
        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
   114
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   115
    elif apply_check "$out" "${@:3}"; then
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   116
        log_skip "$out: Skip serial: $old <- $serial"
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   117
        
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   118
        return
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   119
629
7214fe5c6fac lib/pvl: fixfix
Tero Marttila <tero.marttila@aalto.fi>
parents: 628
diff changeset
   120
    elif [ "$UPDATE_SERIAL" = 0 ]; then
628
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   121
        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
   122
        
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   123
        return
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   124
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   125
    else
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   126
        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
   127
    fi
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   128
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   129
    echo "$serial" > $out
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   130
}
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   131
643
eda838f84366 update: use pvl.dns-process for update_zone
Tero Marttila <tero.marttila@aalto.fi>
parents: 632
diff changeset
   132
## 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
   133
#
643
eda838f84366 update: use pvl.dns-process for update_zone
Tero Marttila <tero.marttila@aalto.fi>
parents: 632
diff changeset
   134
#   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
   135
#
eda838f84366 update: use pvl.dns-process for update_zone
Tero Marttila <tero.marttila@aalto.fi>
parents: 632
diff changeset
   136
# Sets the SOA serial, and adjusts the $INCLUDE paths
628
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   137
function update_zone {
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   138
    local out="$1"
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   139
    local src="$2"
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   140
    local serial="$3"
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   141
    local serial_opt=
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   142
    local msg="$out: Generate zone: $src"
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   143
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   144
    if [ -n "$serial" -a -f "$serial" ]; then
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   145
        serial_opt="--serial=$(cat "$serial")"
629
7214fe5c6fac lib/pvl: fixfix
Tero Marttila <tero.marttila@aalto.fi>
parents: 628
diff changeset
   146
    elif [ "$UPDATE_SERIAL" = 0 ]; then
643
eda838f84366 update: use pvl.dns-process for update_zone
Tero Marttila <tero.marttila@aalto.fi>
parents: 632
diff changeset
   147
        warn "$out: omit noop'd serial"
628
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   148
    else
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   149
        fail "$out: missing serial: $serial"
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
651
599dc457c590 lib/pvl/hosts: fix update_zone and update_zone_include
Tero Marttila <tero.marttila@aalto.fi>
parents: 648
diff changeset
   152
    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
   153
        log_skip "$msg"
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   154
    else
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   155
        log_apply "$msg"
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   156
643
eda838f84366 update: use pvl.dns-process for update_zone
Tero Marttila <tero.marttila@aalto.fi>
parents: 632
diff changeset
   157
        apply_cmd "$out" $OPT/bin/pvl.dns-process \
628
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   158
                $serial_opt \
643
eda838f84366 update: use pvl.dns-process for update_zone
Tero Marttila <tero.marttila@aalto.fi>
parents: 632
diff changeset
   159
                --include-path=$ZONES_INCLUDE \
628
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   160
                "$src"
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   161
    fi
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   162
}
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   163
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   164
## 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
   165
#
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   166
#   check_zone      ..../$zone $origin
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   167
function test_zone {
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   168
    local zone=$1
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   169
    local origin=$2
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   170
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   171
    log_check "$zone: Checking zone @$origin..." 
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   172
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   173
    # 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
   174
    test_cmd $zone \
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   175
        $NAMED_CHECKZONE $origin $zone
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
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   178
## Load update zonefiles into bind:
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   179
#
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   180
#   reload_zones    
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   181
function reload_zones {
629
7214fe5c6fac lib/pvl: fixfix
Tero Marttila <tero.marttila@aalto.fi>
parents: 628
diff changeset
   182
    if [ "$UPDATE_RELOAD" = 1 ]; then
628
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   183
        log_force "Reload zones"
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   184
        
629
7214fe5c6fac lib/pvl: fixfix
Tero Marttila <tero.marttila@aalto.fi>
parents: 628
diff changeset
   185
    elif [ "$UPDATE_RELOAD" = 0 ]; then
628
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   186
        log_noop "Skip reload zones"
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   187
        
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   188
        return
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   189
    
712
97fa1b086b36 lib/pvl/hosts/zone: use service bind9 reload instead of rndc
Tero Marttila <tero.marttila@aalto.fi>
parents: 664
diff changeset
   190
    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
   191
        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
   192
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   193
        return
712
97fa1b086b36 lib/pvl/hosts/zone: use service bind9 reload instead of rndc
Tero Marttila <tero.marttila@aalto.fi>
parents: 664
diff changeset
   194
 
628
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   195
    else
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   196
        log_apply "Reload zones"
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   197
    fi
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   198
712
97fa1b086b36 lib/pvl/hosts/zone: use service bind9 reload instead of rndc
Tero Marttila <tero.marttila@aalto.fi>
parents: 664
diff changeset
   199
    service_reload $NAMED_SERVICE
628
b10ad946d01d update: refactor into modularized lib/pvl/**.sh layout
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   200
}