freifunk-franken
/
dns-scripts
6
1
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

better fix for symbolic link loop; refactoring 

Signed-off-by: Blackyfff <freifunk@freifunk-herpf.de>
This commit is contained in:
Blackyfff 2021-08-30 21:57:28 +02:00
parent 8df132a0bf
commit b61b3cb242
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr/lib/ffdns/update-dns-functions.sh
View File

@ -44,7 +44,7 @@ UpdateMasterZone() {
ZoneTempFolder="$TempFolder""cache/""$MasterDomain""/"
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"
for KeyFile in "$ZoneTempFolder"*; do
[ "$KeyFile" = "$ZoneTempFolder""*" ] || \

4
usr/lib/ffdns/update-dns.sh
View File

@ -49,7 +49,6 @@ if [ -n "$ServeMasterZone" ] || [ -n "$(DoServeOnlyExternZone)" ]; then
if [ -n "$ServeMasterZone" ]; then
MasterFile="$ZoneFilesFolder""db.""$FirstInternalView"".""$MasterDomain"
cp -f "$CachedMasterFile" "$MasterFile"
FileForExternGeneration="$MasterFile"
else
FileForExternGeneration="$CachedMasterFile"
@ -61,13 +60,12 @@ if [ -n "$ServeMasterZone" ] || [ -n "$(DoServeOnlyExternZone)" ]; then
ExternFile="$ZoneFilesFolder""db.extern.""$MasterDomain"
fi
LocalMasterSerial="$(UpdateMasterZone)"
SerialIntern="$(UpdateMasterZone)"
InternalZoneFile="$FileForExternGeneration"
ExternalZoneFile="$ExternFile"
InternalDomain="$MasterDomain"
ExternDomain="$MasterExternDomain"
SerialIntern="$LocalMasterSerial"
UpdateExternal
fi