You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by da...@apache.org on 2017/01/27 16:53:56 UTC
[35/36] incubator-trafficcontrol git commit: Change default answer to
pg in postinstall
Change default answer to pg in postinstall
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/f1f9af06
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/f1f9af06
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/f1f9af06
Branch: refs/heads/master
Commit: f1f9af06907fa1cd13a0273ef0728e66e5d5f8ec
Parents: 2f73509
Author: peter.w.ryder <pe...@gmail.com>
Authored: Fri Jan 20 09:53:20 2017 -0500
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Fri Jan 27 09:52:53 2017 -0700
----------------------------------------------------------------------
traffic_ops/install/bin/postinstall | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/f1f9af06/traffic_ops/install/bin/postinstall
----------------------------------------------------------------------
diff --git a/traffic_ops/install/bin/postinstall b/traffic_ops/install/bin/postinstall
index f1aa23f..fbff253 100755
--- a/traffic_ops/install/bin/postinstall
+++ b/traffic_ops/install/bin/postinstall
@@ -384,7 +384,7 @@ sub getDefaults {
return {
$databaseConfFile => [
{
- "Database type" => "mysql",
+ "Database type" => "pg",
"config_var" => "type"
},
{
@@ -410,7 +410,7 @@ sub getDefaults {
},
{
"Download Maxmind Database?" => "yes",
- "config_var" => "maxmind"
+ "config_var" => "maxmind"
}
],
$dbConfFile => [
@@ -470,11 +470,11 @@ sub getDefaults {
],
$profilesConfFile => [
{
- "Add custom profiles?" =>"no",
- "config_var" => "custom_profiles"
+ "Add custom profiles?" => "no",
+ "config_var" => "custom_profiles"
}
],
- $opensslConfFile => [
+ $opensslConfFile => [
{
"Do you want to generate a certificate?" => "yes",
"config_var" => "genCert"
@@ -565,9 +565,9 @@ sub getDefaults {
# opensslconf: The openssl configuration if any
sub setupDatabase {
- my $todbconf = shift;
- my $opensslconf = shift;
- my $genCert = shift;
+ my $todbconf = shift;
+ my $opensslconf = shift;
+ my $genCert = shift;
my $setupMaxmind = shift;
InstallUtils::logger( "Setting up database", "info" );
@@ -581,7 +581,7 @@ sub setupDatabase {
InstallUtils::logger( "Database initialization succeeded", "info" );
}
- if ($setupMaxmind =~ /^y(?:es)?/) {
+ if ( $setupMaxmind =~ /^y(?:es)?/ ) {
InstallUtils::logger( "Downloading Maxmind data", "info" );
chdir("/opt/traffic_ops/app/public/routing");
$result = InstallUtils::execCommand("/usr/bin/wget http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.mmdb.gz");