equal
deleted
inserted
replaced
176 |
176 |
177 if check_update "$out" "$src" "$serial"; then |
177 if check_update "$out" "$src" "$serial"; then |
178 log_update "Generating $out <- $src..." |
178 log_update "Generating $out <- $src..." |
179 |
179 |
180 do_update "$out" $OPT/bin/pvl.dns-zone "$src" \ |
180 do_update "$out" $OPT/bin/pvl.dns-zone "$src" \ |
|
181 --include-path=$SRV/var/zones \ |
181 $serial_opt |
182 $serial_opt |
182 else |
183 else |
183 log_skip "Generating $out <- $src: not changed" |
184 log_skip "Generating $out <- $src: not changed" |
184 fi |
185 fi |
185 } |
186 } |
200 # check_zone ..../$zone $origin |
201 # check_zone ..../$zone $origin |
201 function check_zone { |
202 function check_zone { |
202 local zone=$1 |
203 local zone=$1 |
203 local origin=$2 |
204 local origin=$2 |
204 |
205 |
|
206 log_check "Checking $zone @ $origin..." |
|
207 |
205 # checkzone is very specific about the order of arguments, -q must be first |
208 # checkzone is very specific about the order of arguments, -q must be first |
206 check $zone $NAMED_CHECKZONE $origin $zone |
209 check $zone $NAMED_CHECKZONE $origin $zone |
207 } |
210 } |
208 |
211 |
209 ## Test DHCP configuration for validity using dhcpd -t: |
212 ## Test DHCP configuration for validity using dhcpd -t: |
212 # |
215 # |
213 # Defaults to the global $DHCPD_CONF. |
216 # Defaults to the global $DHCPD_CONF. |
214 # Fails if the check fails. |
217 # Fails if the check fails. |
215 function check_dhcp { |
218 function check_dhcp { |
216 local conf=${1:-$DHCPD_CONF} |
219 local conf=${1:-$DHCPD_CONF} |
|
220 |
|
221 log_check "Checking DHCP $conf..." |
217 |
222 |
218 if [ ! -e $DHCPD ]; then |
223 if [ ! -e $DHCPD ]; then |
219 log_warn "check_dhcp: dhcpd not installed, skipping: $conf" |
224 log_warn "check_dhcp: dhcpd not installed, skipping: $conf" |
220 return 0 |
225 return 0 |
221 fi |
226 fi |