script/bind
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bind_add_dkim_zone_master.sh: fix error in searching for zone file declaration.

Browse Source
This commit is contained in:
Christoph 2019-01-31 18:13:32 +01:00
parent fff7ba5408
commit f018611912
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bind_add_dkim_zone_master.sh
View File

@ -375,9 +375,9 @@ _zone_configuration_exists=false
if $(grep -q -E "^\s*zone\s+\"$zone\"" $ZONES_DECLARATION_FILE 2>/dev/null) ; then if $(grep -q -E "^\s*zone\s+\"$new_dkim_zone\"" $ZONES_DECLARATION_FILE 2>/dev/null) ; then
info "Zone file declaration for "$zone" already exists." info "Zone file declaration for "$new_dkim_zone" already exists."
_zone_configuration_exists=true _zone_configuration_exists=true
# - Determine zonefile (by reading bind configuration) # - Determine zonefile (by reading bind configuration)
@ -385,7 +385,7 @@ if $(grep -q -E "^\s*zone\s+\"$zone\"" $ZONES_DECLARATION_FILE 2>/dev/null) ; t
echononl "Check if zonefile already exists (by reading bind configuration)" echononl "Check if zonefile already exists (by reading bind configuration)"
_found=false _found=false
declare -i _number=0 declare -i _number=0
regex_zone="^[[:space:]]*zone[[:space:]]+\"$zone\"" regex_zone="^[[:space:]]*zone[[:space:]]+\"$new_dkim_zone\""
regex_file="^[[:space:]]*file" regex_file="^[[:space:]]*file"
while IFS='' read -r line || [[ -n "$line" ]] ; do while IFS='' read -r line || [[ -n "$line" ]] ; do
if [[ $line =~ $regex_zone ]]; then if [[ $line =~ $regex_zone ]]; then
@ -420,7 +420,7 @@ if $(grep -q -E "^\s*zone\s+\"$zone\"" $ZONES_DECLARATION_FILE 2>/dev/null) ; t
else else
if [[ -n "$zone_file" ]] && [[ -f "$zone_file" ]]; then if [[ -n "$zone_file" ]] && [[ -f "$zone_file" ]]; then
info "Also zone file '$zone_file' exists" info "Also zone file '$zone_file' exists"
clean_up 1 clean_up 2
fi fi
fi fi
fi fi