scottk/wlan-lanforge-scripts
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-lanforge-scripts.git synced 2025-11-04 04:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

adjust_apache.pl: fixes bug where tab character could break file

Browse Source 
- Regex was assuming spaces, now looking for \s patterns.
- Improves debug output
- adds gaurd against blank hostname

Signed-off-by: Jed Reynolds <jed@bitratchet.com>
This commit is contained in:
Jed Reynolds
2022-01-19 14:14:37 -08:00
committed by shivam
parent 91259d1474
commit e646d20141
1 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
adjust_apache.pl
View File

@@ -73,6 +73,9 @@ sub info {
my $MgrHostname = `cat /etc/hostname`; my $MgrHostname = `cat /etc/hostname`;
chomp($MgrHostname); chomp($MgrHostname);
if ($MgrHostname =~ /^\s*$/) {
die("System does not appear to have a hostname or /etc/hostname is misformatted.");
}
info("Will be setting hostname to $MgrHostname"); info("Will be setting hostname to $MgrHostname");
sleep 3 if ($debug); sleep 3 if ($debug);
@@ -468,27 +471,43 @@ foreach my $file (@places_to_check) {
# we want to match Listen 80$ or Listen 443 https$ # we want to match Listen 80$ or Listen 443 https$
# we want to replace with Listen lanforge-mgr:80$ or Listen lanforge-mgr:443 https$ # we want to replace with Listen lanforge-mgr:80$ or Listen lanforge-mgr:443 https$
@hunks = grep {/^\s*(Listen|SSLCertificate)/} @lines; @hunks = grep {/^\s*(Listen|SSLCertificate)/} @lines;
#print Dumper(["hunks", \@hunks]);
if (@hunks) { if (@hunks) {
my $edited = 0; my $edited = 0;
my @newlines = (); my @newlines = ();
print "[$file] has something to change...\n";
for my $ln (@hunks) {
print " > $ln\n";
}
@hunks = (@hunks, "\n"); @hunks = (@hunks, "\n");
print "Something to change in $file\n";
print "These lines are interesting:\n";
print join("\n", @hunks);
foreach my $confline (@lines) { foreach my $confline (@lines) {
if ($confline =~ /^\s*Listen\s+(?:80|443) */) { my $has_listen = 0;
$confline =~ s/Listen /Listen ${MgrHostname}:/; my $old_confline = $confline;
print "$confline\n"; if ($confline =~ /^\s*Listen/) {
$has_listen++;
} }
elsif ($confline =~ /^\s*Listen\s+(?:[^:]+:(80|443)) */) { if ($confline =~ /^\s*Listen\s+(?:80|443)\b/) {
$confline =~ s/Listen [^:]+:/Listen ${MgrHostname}:/; $confline =~ s/Listen\s+/Listen ${MgrHostname}:/;
print "$confline\n"; print " [$file] new line: $confline\n";
} }
if ($confline =~ /^\s*SSLCertificateFile /) { elsif ($confline =~ /^\s*Listen\s+:\d+\b/) {
$confline =~ s/Listen\s+:/Listen ${MgrHostname}:/;
print " [$file] new line: $confline\n";
}
elsif ($confline =~ /^\s*Listen\s+(?:[^:]+:(80|443))\b/) {
$confline =~ s/Listen\s+[^:]+:/Listen ${MgrHostname}:/;
print " [$file] new line: $confline\n";
}
if ($confline =~ /^\s*SSLCertificateFile\b/) {
$confline = "SSLCertificateFile $hostname_crt" if ("" ne $hostname_crt); $confline = "SSLCertificateFile $hostname_crt" if ("" ne $hostname_crt);
print " [$file] new line: $confline\n";
} }
if ($confline =~ /^\s*SSLCertificateKeyFile /) { if ($confline =~ /^\s*SSLCertificateKeyFile\b/) {
$confline = "SSLCertificateKeyFile $hostname_key" if ("" ne $hostname_key); $confline = "SSLCertificateKeyFile $hostname_key" if ("" ne $hostname_key);
print " [$file] new line: $confline\n";
}
if (($has_listen > 0) && ($old_confline eq $confline)) {
print " [$file] Listen line unchanged: [$confline]\n";
} }
push @newlines, $confline; push @newlines, $confline;
$edited++ if ($confline =~ /# modified by lanforge/); $edited++ if ($confline =~ /# modified by lanforge/);