better fix for symbolic link loop; refactoring
Signed-off-by: Blackyfff <freifunk@freifunk-herpf.de>
This commit is contained in:
parent
8df132a0bf
commit
b61b3cb242
|
@ -44,7 +44,7 @@ UpdateMasterZone() {
|
||||||
ZoneTempFolder="$TempFolder""cache/""$MasterDomain""/"
|
ZoneTempFolder="$TempFolder""cache/""$MasterDomain""/"
|
||||||
|
|
||||||
UpdateMaster="$(UpdateDNSSECEntryCache "$MasterDomain" "$ZoneTempFolder" "$CachedMasterFile" "$DNSSECKeyFolder")"
|
UpdateMaster="$(UpdateDNSSECEntryCache "$MasterDomain" "$ZoneTempFolder" "$CachedMasterFile" "$DNSSECKeyFolder")"
|
||||||
if [ $((PostFetchMasterSerial)) -gt $((PreFetchMasterSerial)) ] || [ $UpdateMaster -ne 0 ]; then
|
if [ $((PostFetchMasterSerial)) -gt $((PreFetchMasterSerial)) ] || [ $UpdateMaster -ne 0 ] || [ ! -f "$MasterFile" ]; then
|
||||||
cp -f "$CachedMasterFile" "$CachedMasterFile""I"
|
cp -f "$CachedMasterFile" "$CachedMasterFile""I"
|
||||||
for KeyFile in "$ZoneTempFolder"*; do
|
for KeyFile in "$ZoneTempFolder"*; do
|
||||||
[ "$KeyFile" = "$ZoneTempFolder""*" ] || \
|
[ "$KeyFile" = "$ZoneTempFolder""*" ] || \
|
||||||
|
|
|
@ -49,7 +49,6 @@ if [ -n "$ServeMasterZone" ] || [ -n "$(DoServeOnlyExternZone)" ]; then
|
||||||
|
|
||||||
if [ -n "$ServeMasterZone" ]; then
|
if [ -n "$ServeMasterZone" ]; then
|
||||||
MasterFile="$ZoneFilesFolder""db.""$FirstInternalView"".""$MasterDomain"
|
MasterFile="$ZoneFilesFolder""db.""$FirstInternalView"".""$MasterDomain"
|
||||||
cp -f "$CachedMasterFile" "$MasterFile"
|
|
||||||
FileForExternGeneration="$MasterFile"
|
FileForExternGeneration="$MasterFile"
|
||||||
else
|
else
|
||||||
FileForExternGeneration="$CachedMasterFile"
|
FileForExternGeneration="$CachedMasterFile"
|
||||||
|
@ -61,13 +60,12 @@ if [ -n "$ServeMasterZone" ] || [ -n "$(DoServeOnlyExternZone)" ]; then
|
||||||
ExternFile="$ZoneFilesFolder""db.extern.""$MasterDomain"
|
ExternFile="$ZoneFilesFolder""db.extern.""$MasterDomain"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
LocalMasterSerial="$(UpdateMasterZone)"
|
SerialIntern="$(UpdateMasterZone)"
|
||||||
|
|
||||||
InternalZoneFile="$FileForExternGeneration"
|
InternalZoneFile="$FileForExternGeneration"
|
||||||
ExternalZoneFile="$ExternFile"
|
ExternalZoneFile="$ExternFile"
|
||||||
InternalDomain="$MasterDomain"
|
InternalDomain="$MasterDomain"
|
||||||
ExternDomain="$MasterExternDomain"
|
ExternDomain="$MasterExternDomain"
|
||||||
SerialIntern="$LocalMasterSerial"
|
|
||||||
UpdateExternal
|
UpdateExternal
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue