# HG changeset patch # User Tero Marttila # Date 1334232420 -10800 # Node ID dcb432cfeacc5c12ce7f1ba42f020dc4f4ba4cb8 # Parent a8160670c3cb03b3c503ad9361c27e90a405c2cd update: generate all domain-zones using update_zone from either settings/paivola.*.zone or settings/paivola.zone instead of linking them all to paivola; different domains may now use their own zones if required diff -r a8160670c3cb -r dcb432cfeacc bin/update --- a/bin/update Thu Apr 12 15:04:34 2012 +0300 +++ b/bin/update Thu Apr 12 15:07:00 2012 +0300 @@ -160,8 +160,8 @@ log "Updating zones..." # view zone base update_zone internal pvl - update_zone internal paivola - update_zone external paivola +# update_zone internal paivola +# update_zone external paivola update_zone internal 10 update_zone internal 192.168 @@ -173,8 +173,8 @@ ## Test log "Testing zones..." # view zone origin - check_zone internal paivola paivola.fi - check_zone external paivola paivola.fi +# check_zone internal paivola paivola.fi +# check_zone external paivola paivola.fi check_zone internal 10 10.in-addr.arpa check_zone internal 192.168 192.168.in-addr.arpa @@ -184,8 +184,20 @@ log "Linking domains..." for view in "${VIEWS[@]}"; do for zone in "${DOMAINS[@]}"; do + # choose input .zone to use + base=$(choose_zone $zone $DOMAIN_BASE) + + if [ $base != $DOMAIN_BASE ]; then + # serial + # XXX: not all zones use all these includes? + update_serial $base $DATA/$base.zone \ + $ZONES/hosts/paivola:* \ + $ZONES/includes/paivola:* \ + $ZONES/includes/paivola.* + fi + # link - link_zone $view $zone $DOMAIN_BASE + update_zone $view $zone $base # test check_zone $view $zone $zone