--- a/bin/update	Thu Dec 19 20:47:43 2013 +0200
+++ b/bin/update	Thu Dec 19 21:04:07 2013 +0200
@@ -48,9 +48,9 @@
 
     ## Hosts
     log "Updating forward host zones..."
-    for hosts in $(list_files etc/hosts); do
-        update_hosts_forward    "var/zones/hosts/$hosts"            "$hosts" \
-            "etc/hosts/$hosts"
+    for zone in $(list_dirs etc/hosts/forward); do
+        update_hosts_forward    "var/zones/hosts/forward/$zone"     "$zone" \
+            etc/hosts/forward/$zone/*
     done
 
     log "Updating DHCP hosts..."
@@ -60,9 +60,9 @@
     done
 
     log "Updating reverse host zones..."
-    for zone in $(list_dirs etc/reverse-zones-hosts); do
-        update_hosts_reverse    "var/zones/hosts/$zone"             "$zone" \
-            etc/reverse-zones-hosts/$zone/*
+    for zone in $(list_dirs etc/hosts/reverse); do
+        update_hosts_reverse    "var/zones/hosts/reverse/$zone"     "$zone" \
+            etc/hosts/reverse/$zone/*
     done
 
     ## Zones
@@ -126,7 +126,10 @@
     for dir in var/dhcp/hosts; do
         ensure_dir  $dir
     done
-    for dir in var/zones/includes var/zones/hosts var/zones/reverse-hosts; do
+    for dir in var/zones/includes var/zones/hosts; do
+        ensure_dir  $dir
+    done
+    for dir in var/zones/hosts/forward var/zones/hosts/reverse; do
         ensure_dir  $dir
     done
 

--- a/lib/update.operations	Thu Dec 19 20:47:43 2013 +0200
+++ b/lib/update.operations	Thu Dec 19 21:04:07 2013 +0200
@@ -57,25 +57,16 @@
 function update_hosts_forward {
     local out="$1"; shift
     local domain="$1"; shift
-    local src="$1"; shift
-
-    local origin_opts=
 
-    if [[ "$domain" == *.* ]]; then
-        origin_opts="--add-origin"
-    fi
-
-    if check_update "$out" "$src" "$@"; then
-        log_update "Generating forward hosts zone $out <- $src..."
+    if check_update "$out" "$@"; then
+        log_update "Generating forward hosts zone $out @ $domain <- $@..."
     
         do_update "$out" $OPT/bin/pvl.hosts-dns \
             --hosts-charset=$CHARSET \
             --forward-zone="$domain" \
-            $origin_opts \
-             "$src" "$@"
-    
+             "$@"
     else
-        log_skip "Generating forward hosts $out <- $src: not changed"
+        log_skip "Generating forward hosts $out <- $@: not changed"
     fi
 }
 
@@ -100,19 +91,16 @@
 function update_hosts_reverse {
     local out="$1"; shift
     local reverse="$1"; shift
-    local src="$1"; shift
 
-    if check_update "$out" "$src" "$@"; then
-        log_update "Generating reverse hosts zone $out <- $src..."
+    if check_update "$out" "$@"; then
+        log_update "Generating reverse hosts zone $out <- $@..."
     
         do_update "$out" $OPT/bin/pvl.hosts-dns \
             --hosts-charset=$CHARSET \
             --reverse-zone="$reverse" \
-            --add-origin \
-            "$src" "$@"
-    
+            "$@"
     else
-        log_skip "Generating reverse hosts $out <- $src: not changed"
+        log_skip "Generating reverse hosts $out <- $@: not changed"
     fi
 }