scottk/wlan-lanforge-scripts
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-lanforge-scripts.git synced 2025-10-31 18:58:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

adjust_apache.pl: fixes removing old IPs remaining from previous leases; fixes greedy matching hostnames with hyphens that should stay separate (X-local)

Browse Source
This commit is contained in:
Jed Reynolds
2020-07-07 22:59:25 -07:00
parent 8b08248fa2
commit 0f12515bbd
1 changed files with 58 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
adjust_apache.pl
View File

@@ -65,14 +65,31 @@ if (-f "$fname") {
#my $blank = 0; #my $blank = 0;
#my $was_blank = 0; #my $was_blank = 0;
my $counter = 0; my $counter = 0;
my $debug = 0; my $debug = 1;
my %host_map = (
"localhost.localdomain" => "127.0.0.1",
"localhost" => "127.0.0.1",
"localhost4.localdomain4" => "127.0.0.1",
"localhost4" => "127.0.0.1",
"localhost.localdomain" => "::1",
"localhost" => "::1",
"localhost6.loaldomain6" => "::1",
"localhost6" => "::1",
$MgrHostname => $ip,
"lanforge.localnet" => "192.168.1.101",
"lanforge.localdomain" => "192.168.1.101",
);
my %address_map = ( my %address_map = (
"127.0.0.1" => "localhost.localdomain localhost localhost4.localdomain4 localhost4", "127.0.0.1" => "localhost.localdomain localhost localhost4.localdomain4 localhost4",
"::1" => "localhost.localdomain localhost localhost6.loaldomain6 localhost6", "::1" => "localhost.localdomain localhost localhost6.loaldomain6 localhost6",
$ip => $MgrHostname, $ip => $MgrHostname,
"192.168.1.101" => "lanforge.localnet lanforge.localdomain", "192.168.1.101" => "lanforge.localnet lanforge.localdomain",
); );
print Dumper(\%address_map) if ($debug); if ($debug){
print Dumper(\%address_map);
print Dumper(\%host_map);
}
my $prevname = ""; my $prevname = "";
my $previp = ""; my $previp = "";
@@ -92,28 +109,28 @@ if (-f "$fname") {
print "\n HUNK",$counter2,"-:$hunk:- " if ($debug); print "\n HUNK",$counter2,"-:$hunk:- " if ($debug);
$counter2++; $counter2++;
next if ($hunk =~ /^localhost/); next if ($hunk =~ /^localhost/);
next if ($hunk =~ /^lanforge-srv\b/); next if ($hunk =~ /^lanforge-srv$/);
next if ($hunk =~ /^lanforge\.local(domain|net)\b/); next if ($hunk =~ /^lanforge\.local(domain|net)$/);
next if ($hunk =~ /^extra6?-\d+/); next if ($hunk =~ /^extra6?-\d+/);
if (($hunk =~ /^$ip\b/) if ($hunk =~ /^$ip$/) {
|| ($hunk =~ /^$MgrHostname\b/)){
$linehasip++; $linehasip++;
$lfhostname++; $lfhostname++;
}
elsif ($hunk =~ /^$MgrHostname$/) {
$lfhostname++;
$prevname = $hunk; $prevname = $hunk;
} }
if (($hunk =~ /^127\.0\.0\.1/) if (($hunk =~ /^127\.0\.0\.1/)
|| ($hunk =~ /^192\.168\.1\.101/) || ($hunk =~ /^192\.168\.1\.101/)
|| ($hunk =~ /^::1\b/)){ || ($hunk =~ /^::1$/)){
$previp = $hunk; $previp = $hunk;
$linehasip++; $linehasip++;
} }
elsif ($hunk =~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/) {
if ($hunk =~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\b/) {
$linehasip++; $linehasip++;
print " IP4($hunk)" if ($debug); print " IP4($hunk)" if ($debug);
$previp = $hunk;
if ($counter2 > 0) { # we're not first item on line if ($counter2 > 0) { # we're not first item on line
$middleip++ if ($counter2 > 0); $middleip++ if ($counter2 > 0);
print "middle" if ($debug); print "middle" if ($debug);
@@ -122,6 +139,13 @@ if (-f "$fname") {
$address_map{$hunk} = ""; $address_map{$hunk} = "";
} }
print "+IP4" if ($debug); print "+IP4" if ($debug);
if (("" ne $prevname) && ($counter2 > 0)) {
print " hunk($hunk)prev($prevname)" if ($debug);
$address_map{$hunk} .= " $prevname"
if ($address_map{$hunk} !~ /\s*$prevname\s*/);
$host_map{$prevname} .= " $hunk";
}
$previp = $hunk; $previp = $hunk;
} }
elsif (($hunk =~ /[G-Zg-z]+\.?/) || ($hunk =~ /^[^:A-Fa-f0-9]+/)) { elsif (($hunk =~ /[G-Zg-z]+\.?/) || ($hunk =~ /^[^:A-Fa-f0-9]+/)) {
@@ -132,22 +156,26 @@ if (-f "$fname") {
$address_map{$previp} .= " $hunk" $address_map{$previp} .= " $hunk"
if ($address_map{$previp} !~ /\b$hunk\b/); if ($address_map{$previp} !~ /\b$hunk\b/);
$prevname = $hunk; $prevname = $hunk;
$host_map{$prevname} .= " $previp";
} }
elsif ($linehasip) { elsif ($linehasip) {
print " prev($previp $hunk)" if ($debug); print " prev($previp $hunk)" if ($debug);
$address_map{$previp} .= " $hunk" $address_map{$previp} .= " $hunk"
if ($address_map{$previp} !~ /\b$hunk\b/); if ($address_map{$previp} !~ /\s*$hunk\s*/);
$host_map{$hunk} .= " $previp";
} }
elsif ($lfhostname) { elsif ($lfhostname) {
$more_hostnames{$hunk} = 1; $more_hostnames{$hunk} = 1;
$host_map{$hunk} .= " $previp";
} }
else { # strange word else { # strange word
if ("" eq $previp) { if ("" eq $previp) {
print " hunk($hunk) has no IP***" if ($debug); print " hunk($hunk) has no IP***" if ($debug);
$more_hostnames{$hunk} = 1; $more_hostnames{$hunk} = 1;
} }
elsif ($address_map{$previp} !~ /\b$hunk\b/) { elsif ($address_map{$previp} !~ /\s*$hunk\s*/) {
$address_map{$previp} .= " $hunk" $address_map{$previp} .= " $hunk";
$host_map{$hunk} .= " $previp";
} }
} }
} }
@@ -160,27 +188,25 @@ if (-f "$fname") {
} }
$previp = $hunk; $previp = $hunk;
} }
elsif ($hunk =~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\b/) { elsif ($address_map{$previp} !~ /\s*$hunk\s*/) { # is hostname and not an ip
print " hunk($hunk)prev($prevname)" if ($debug);
$address_map{$hunk} .= " $prevname"
if ($address_map{$hunk} !~ /\b$prevname\b/);
$previp = $hunk;
}
elsif ($address_map{$previp} !~ /\b$hunk\b/) { # is hostname and not an ip
$address_map{$previp} .= " $hunk"; $address_map{$previp} .= " $hunk";
$host_map{$hunk} .= " $previp";
} }
} # ~foreach hunk } # ~foreach hunk
} # ~foreach line } # ~foreach line
if (($host_map{$MgrHostname} !~ /^\s*$/) && ($host_map{$MgrHostname} =~ /\S+\s+\S+/)) {
print("Multiple IPs for this hostname: ".$host_map{$MgrHostname}."\n");
my @iphunks = split(/\s+/, $host_map{$MgrHostname});
print "WARNING changing $MgrHostname for to $ip; line was <<$host_map{$MgrHostname}>> addrmap: <<$address_map{$ip}>>\n"
if ($debug);
$host_map{$MgrHostname} = $ip;
}
for my $name (sort keys %more_hostnames) { for my $name (sort keys %more_hostnames) {
$address_map{$ip} .= " $name"; $address_map{$ip} .= " $name";
print "NEWSTUFF $ip $address_map{$ip}\n" if ($debug); print "NEWSTUFF $ip $address_map{$ip}\n" if ($debug);
} }
print Dumper(\%address_map) if ($debug);
unshift(@newlines, "192.168.1.101 ".$address_map{"192.168.1.101"}); unshift(@newlines, "192.168.1.101 ".$address_map{"192.168.1.101"});
unshift(@newlines, "127.0.0.1 ".$address_map{"127.0.0.1"}); unshift(@newlines, "127.0.0.1 ".$address_map{"127.0.0.1"});
unshift(@newlines, "::1 ".$address_map{"::1"}); unshift(@newlines, "::1 ".$address_map{"::1"});
@@ -189,8 +215,16 @@ if (-f "$fname") {
delete($address_map{"127.0.0.1"}); delete($address_map{"127.0.0.1"});
delete($address_map{"::1"}); delete($address_map{"::1"});
print Dumper(\%address_map) if ($debug);
print Dumper(\%host_map) if ($debug);
for my $key (sort keys %address_map){ for my $key (sort keys %address_map){
next if ($key eq $ip); next if ($key eq $ip);
if ($address_map{$key} =~ /\s*$MgrHostname\s*/) {
print("SKIPPING $key / $address_map{$key}\n")
if ($debug);
next;
}
push(@newlines, $key." ".$address_map{$key}); push(@newlines, $key." ".$address_map{$key});
} }
push(@newlines, "###-LF-HOSTNAME-NEXT-###"); push(@newlines, "###-LF-HOSTNAME-NEXT-###");