fix: $FirstInternalView not set in debian when only one entry in $InternalViews; debian sed handles overhang reference different to openwrt
Signed-off-by: Blackyfff <freifunk@freifunk-herpf.de>
This commit is contained in:
parent
06653dfb91
commit
6f80db0105
|
@ -54,7 +54,7 @@ UpdateMasterZone() {
|
||||||
|
|
||||||
if [ $((PostFetchMasterSerial)) -le $((LocalMasterSerial)) ]; then
|
if [ $((PostFetchMasterSerial)) -le $((LocalMasterSerial)) ]; then
|
||||||
LocalMasterSerial=$((LocalMasterSerial+1))
|
LocalMasterSerial=$((LocalMasterSerial+1))
|
||||||
sed -i -e 's/^\(\s*\)'"$PostFetchMasterSerial"'\(\s*;\s*[Ss]erial.*\)$/\1'"$LocalMasterSerial"'\3/g' "$CachedMasterFile""I"
|
sed -i -e 's/^\(\s*\)'"$PostFetchMasterSerial"'\(\s*;\s*[Ss]erial.*\)$/\1'"$LocalMasterSerial"'\2/g' "$CachedMasterFile""I"
|
||||||
sed -i -e 's/^\(\s*\S\+\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Ss][Oo][Aa]\s\+\S\+\s\+\S\+\s\+\)'"$PostFetchMasterSerial"'\(\s\+.*\)$/\1'"$LocalMasterSerial"'\3/g' "$CachedMasterFile""I"
|
sed -i -e 's/^\(\s*\S\+\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Ss][Oo][Aa]\s\+\S\+\s\+\S\+\s\+\)'"$PostFetchMasterSerial"'\(\s\+.*\)$/\1'"$LocalMasterSerial"'\3/g' "$CachedMasterFile""I"
|
||||||
else
|
else
|
||||||
LocalMasterSerial=$((PostFetchMasterSerial))
|
LocalMasterSerial=$((PostFetchMasterSerial))
|
||||||
|
@ -105,7 +105,7 @@ UpdateExternal() {
|
||||||
|
|
||||||
if [ $((SerialIntern)) -le $((LocalExtDomainMasterSerial)) ]; then
|
if [ $((SerialIntern)) -le $((LocalExtDomainMasterSerial)) ]; then
|
||||||
LocalExtDomainMasterSerial=$((LocalExtDomainMasterSerial+1))
|
LocalExtDomainMasterSerial=$((LocalExtDomainMasterSerial+1))
|
||||||
sed -i -e 's/^\(\s*\)'"$SerialIntern"'\(\s*;\s*[Ss]erial.*\)$/\1'"$LocalExtDomainMasterSerial"'\3/g' "$CachedZoneFile"
|
sed -i -e 's/^\(\s*\)'"$SerialIntern"'\(\s*;\s*[Ss]erial.*\)$/\1'"$LocalExtDomainMasterSerial"'\2/g' "$CachedZoneFile"
|
||||||
sed -i -e 's/^\(\s*\S\+\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Ss][Oo][Aa]\s\+\S\+\s\+\S\+\s\+\)'"$SerialIntern"'\(\s\+.*\)$/\1'"$LocalExtDomainMasterSerial"'\3/g' "$CachedZoneFile"
|
sed -i -e 's/^\(\s*\S\+\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Ss][Oo][Aa]\s\+\S\+\s\+\S\+\s\+\)'"$SerialIntern"'\(\s\+.*\)$/\1'"$LocalExtDomainMasterSerial"'\3/g' "$CachedZoneFile"
|
||||||
fi
|
fi
|
||||||
mv "$CachedZoneFile" "$ExtDomainFile"
|
mv "$CachedZoneFile" "$ExtDomainFile"
|
||||||
|
|
|
@ -28,7 +28,7 @@ if [ -n "$CommunityExternPrefix" ];then
|
||||||
[ -z "$SubCommunityDomain" ] || MasterExternDomain="$SubCommunityDomain"".""$MasterExternDomain"
|
[ -z "$SubCommunityDomain" ] || MasterExternDomain="$SubCommunityDomain"".""$MasterExternDomain"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
FirstInternalView="$( echo "$InternalViews" | sed -ne 's/^\(\S\+\)\s.*$/\1/p')"
|
FirstInternalView="$( echo "$InternalViews" | sed -e 's/\s.*//')"
|
||||||
# ForwardZones: "<Zone>/<Zonendatei>" ; optionaly multiple " ""<ZoneX>/<ZonendateiX>" no spaces in full filename
|
# ForwardZones: "<Zone>/<Zonendatei>" ; optionaly multiple " ""<ZoneX>/<ZonendateiX>" no spaces in full filename
|
||||||
ForwardZones="$MasterDomain""/""$ZoneFilesFolder""db.""$FirstInternalView"".""$MasterDomain"
|
ForwardZones="$MasterDomain""/""$ZoneFilesFolder""db.""$FirstInternalView"".""$MasterDomain"
|
||||||
BindIcvpnAclTmp="$TempFolder""icvpn-acl.conf"
|
BindIcvpnAclTmp="$TempFolder""icvpn-acl.conf"
|
||||||
|
|
Loading…
Reference in New Issue