--- 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
}