From 91824bee037ccff0ea419110b4947a883f3f3f2e Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Fri, 15 Jan 2021 23:35:47 +0100 Subject: [PATCH] change formatting of Leases to spaces --- update-hoodzone.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/update-hoodzone.sh b/update-hoodzone.sh index 2318d9e..54dc71b 100755 --- a/update-hoodzone.sh +++ b/update-hoodzone.sh @@ -22,7 +22,7 @@ GetLeaseEntriesInSubnet() { OldLeases="$(sed -e '/^;### Leases ###/,$!d' "$HoodZoneFile" | sed 1d)" if [ -f "/tmp/dhcp.leases" ]; then - DnsmasqLeases="$(sed -ne 's/^\s*\(\S\+\s\+\)\{2\}\(\S\+\)\s\+\([_0-9a-zA-Z-]\+\)\s\+.*/\3 IN A \2/p' "/tmp/dhcp.leases")" + DnsmasqLeases="$(sed -ne 's/^\s*\(\S\+\s\+\)\{2\}\(\S\+\)\s\+\([_0-9a-zA-Z-]\+\)\s\+.*/\3 IN A \2/p' "/tmp/dhcp.leases")" for Subnet in $Subnets; do IsValidIPv4Subnet "$Subnet" && NewLeases="$(echo "$NewLeases"; GetLeaseEntriesInSubnet "$DnsmasqLeases" "$Subnet")" done @@ -30,8 +30,8 @@ fi for Leasefile in /tmp/hosts/*; do if [ -n "${Leasefile##*/tmp/hosts/\*}" ]; then - NewLeases="$(echo "$NewLeases"; sed -ne 's/^\s*\([0-9.]*\)\s\+\([_0-9a-zA-Z-]\+\)'"$DomainReg"'.*/\2 IN A \1/p' "$Leasefile")" - NewLeases="$(echo "$NewLeases"; sed -ne 's/^\s*\([0-9a-fA-F:]*\)\s\+\([_0-9a-zA-Z-]\+\)'"$DomainReg"'.*/\2 IN AAAA \1/p' "$Leasefile")" + NewLeases="$(echo "$NewLeases"; sed -ne 's/^\s*\([0-9.]*\)\s\+\([_0-9a-zA-Z-]\+\)'"$DomainReg"'.*/\2 IN A \1/p' "$Leasefile")" + NewLeases="$(echo "$NewLeases"; sed -ne 's/^\s*\([0-9a-fA-F:]*\)\s\+\([_0-9a-zA-Z-]\+\)'"$DomainReg"'.*/\2 IN AAAA \1/p' "$Leasefile")" fi done @@ -40,7 +40,10 @@ NewLeases="$(echo "$NewLeases" | awk '!a[$0]++' | # uncomment and duplicate to secure static DNS-Entries # sed -e '/^dns\s\+.*/d' | - awk 'BEGIN{FS="\t"}{l=length($1);y=substr("\t\t\t\t\t\t", 1+length($1)/4);x=substr($0,length($1)+1); print $1 y x}' )" + awk 'BEGIN{FS="\t"}{l=length($1);f=substr(" ", 1+length($1)); + s=substr(" ", 1+length($2)); + x=substr($0,length($1)+length($2)+3); + print $1 f " " $2 s " " x}' )" if [ "$NewLeases" != "$OldLeases" ]; then NewSerial="$(GetZoneFileSerial "$HoodZoneFile")" NewSerial=$((NewSerial+1))