Fix TO Golang setting port in cdn.conf c/o @dangogh @dewrich
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/d45733b2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/d45733b2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/d45733b2 Branch: refs/heads/master Commit: d45733b25f4c775871e1306c61303786638ac6fd Parents: f212661 Author: Robert Butts <robert.o.bu...@gmail.com> Authored: Tue Aug 1 17:39:14 2017 -0600 Committer: Dewayne Richardson <dewr...@apache.org> Committed: Thu Aug 10 09:46:03 2017 -0600 ---------------------------------------------------------------------- traffic_ops/install/bin/_postinstall | 17 +++++++++++------ traffic_ops/install/lib/InstallUtils.pm | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/d45733b2/traffic_ops/install/bin/_postinstall ---------------------------------------------------------------------- diff --git a/traffic_ops/install/bin/_postinstall b/traffic_ops/install/bin/_postinstall old mode 100755 new mode 100644 index b83e65a..4659142 --- a/traffic_ops/install/bin/_postinstall +++ b/traffic_ops/install/bin/_postinstall @@ -185,13 +185,17 @@ sub generateDbConf { sub setCdnConfGoPort { my $cdnConf = shift; - if ( exists $cdnConf->{"traffic_ops_golang_port"} ) { + if ( exists $cdnConf->{traffic_ops_golang_port} ) { return $cdnConf; } - my ($port) = $cdnConf->{hypnotoad}->{listen}[0] =~ m/\:(\d+)/; - $cdnConf->{hypnotoad}->{listen}[0] =~ s/\:\d+/\:60443/; - $cdnConf->{hypnotoad}->{listen}[0] =~ s/https\:\/\/[\:\:]/https\:\/\/127\.0\.0\.1/; - $cdnConf->{"traffic_ops_golang_port"} = $port; + + my $listen = $cdnConf->{hypnotoad}{listen}[0]; + my ($port) = $listen =~ /:(\d+)/; + $listen =~ s/:$port/:60443/; + $listen =~ s{'https://\[::\]}{'https://127.0.0.1}; + + $cdnConf->{traffic_ops_golang_port} = $port; + $cdnConf->{hypnotoad}{listen} = [ $listen ]; return $cdnConf; } @@ -232,6 +236,7 @@ sub generateCdnConf { } $cdnConf = setCdnConfGoPort($cdnConf); $cdnConf->{hypnotoad}{workers} = $cdnConfiguration{workers}; + #InstallUtils::logger("cdnConf: " . Dumper($cdnConf), "info" ); InstallUtils::writePerl( $fileName, $cdnConf ); InstallUtils::logger( "CDN configuration has been saved", "info" ); } @@ -868,7 +873,6 @@ sub main { # The generator functions handle checking input/default/automatic mode # todbconf will be used later when setting up the database my $todbconf = generateDbConf( $userInput, $databaseConfFile, $dbConfFile ); - generateCdnConf( $userInput, $cdnConfFile ); generateLdapConf( $userInput, $ldapConfFile ); my $adminconf = generateUsersConf( $userInput, $usersConfFile ); my $custom_profile = generateProfilesDir( $userInput, $profilesConfFile ); @@ -881,6 +885,7 @@ sub main { setupMaxMind( $todbconf->{"maxmind"} ); setupCertificates( $opensslconf ); + generateCdnConf( $userInput, $cdnConfFile ); my $dbh = Database::connect($databaseConfFile, $todbconf); if (!$dbh) { http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/d45733b2/traffic_ops/install/lib/InstallUtils.pm ---------------------------------------------------------------------- diff --git a/traffic_ops/install/lib/InstallUtils.pm b/traffic_ops/install/lib/InstallUtils.pm index 040a8e9..a7df222 100644 --- a/traffic_ops/install/lib/InstallUtils.pm +++ b/traffic_ops/install/lib/InstallUtils.pm @@ -225,7 +225,7 @@ sub writePerl { my $dumper = Data::Dumper->new( [$data] ); # print without var names and with simple indentation - print $fh $dumper->Terse(1)->Dump(); + print $fh $dumper->Quotekeys(0)->Terse(1)->Dump(); close $fh; }
