You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2017/04/20 21:23:05 UTC
[1/3] incubator-trafficcontrol git commit: indent fix
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master a92bb7128 -> 8d9329c1c
indent fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/794df47c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/794df47c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/794df47c
Branch: refs/heads/master
Commit: 794df47c7c05747f2c7804fe70adf65fb3536189
Parents: 7f3622c
Author: Dan Kirkwood <da...@gmail.com>
Authored: Thu Apr 20 15:20:00 2017 -0600
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Thu Apr 20 15:22:29 2017 -0600
----------------------------------------------------------------------
traffic_ops/install/bin/_postinstall | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/794df47c/traffic_ops/install/bin/_postinstall
----------------------------------------------------------------------
diff --git a/traffic_ops/install/bin/_postinstall b/traffic_ops/install/bin/_postinstall
index 35921d7..66ecf7a 100755
--- a/traffic_ops/install/bin/_postinstall
+++ b/traffic_ops/install/bin/_postinstall
@@ -497,7 +497,7 @@ sub getDefaults {
"config_var" => "common_name"
},
{
- "RSA Passphrase" => "",
+ "RSA Passphrase" => "CHANGEME!!",
"config_var" => "rsaPassword",
"hidden" => "true"
}
@@ -778,7 +778,7 @@ sub main {
## Create the tm_user
my $dbconf = InstallUtils::readJson($databaseConfFile);
- my $dsn = sprintf( "DBI:%s:db=%s;host=%s;port=%d", $dbconf->{type}, $dbconf->{dbname}, $dbconf->{hostname}, $dbconf->{port} );
+ my $dsn = sprintf( "DBI:%s:db=%s;host=%s;port=%d", $dbconf->{type}, $dbconf->{dbname}, $dbconf->{hostname}, $dbconf->{port} );
my $dbh = DBI->connect( $dsn, $todbconf->{"dbAdminUser"}, $todbconf->{"dbAdminPw"} );
my $sha1_passwd = sha1_hex( $adminconf->{"password"} );
my $sub_string = sprintf( "('%s', 4, '%s')", $adminconf->{"username"}, $sha1_passwd, $sha1_passwd );
[3/3] incubator-trafficcontrol git commit: This closes #495
Posted by mi...@apache.org.
This closes #495
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/8d9329c1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/8d9329c1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/8d9329c1
Branch: refs/heads/master
Commit: 8d9329c1c2ebc9ec5a21dae582004bed41f71abe
Parents: 794df47
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Thu Apr 20 15:22:52 2017 -0600
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Thu Apr 20 15:22:52 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/3] incubator-trafficcontrol git commit: fix DBI->connect calls to
allow connection to remote host
Posted by mi...@apache.org.
fix DBI->connect calls to allow connection to remote host
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/7f3622ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/7f3622ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/7f3622ca
Branch: refs/heads/master
Commit: 7f3622ca8b37cd5b805391d1dce186c481d1baae
Parents: a92bb71
Author: Dan Kirkwood <da...@gmail.com>
Authored: Thu Apr 20 14:46:41 2017 -0600
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Thu Apr 20 15:22:29 2017 -0600
----------------------------------------------------------------------
traffic_ops/install/bin/_postinstall | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/7f3622ca/traffic_ops/install/bin/_postinstall
----------------------------------------------------------------------
diff --git a/traffic_ops/install/bin/_postinstall b/traffic_ops/install/bin/_postinstall
index 751f78e..35921d7 100755
--- a/traffic_ops/install/bin/_postinstall
+++ b/traffic_ops/install/bin/_postinstall
@@ -473,19 +473,19 @@ sub getDefaults {
"config_var" => "genCert"
},
{
- "Country Name (2 letter code)" => "XX",
+ "Country Name (2 letter code)" => "",
"config_var" => "country"
},
{
- "State or Province Name (full name)" => "San Jose",
+ "State or Province Name (full name)" => "",
"config_var" => "state"
},
{
- "Locality Name (eg, city)" => "Default City",
+ "Locality Name (eg, city)" => "",
"config_var" => "locality"
},
{
- "Organization Name (eg, company)" => "Default Company Ltd",
+ "Organization Name (eg, company)" => "",
"config_var" => "company"
},
{
@@ -493,7 +493,7 @@ sub getDefaults {
"config_var" => "org_unit"
},
{
- "Common Name (eg, your name or your server's hostname)" => "example.com",
+ "Common Name (eg, your name or your server's hostname)" => "",
"config_var" => "common_name"
},
{
@@ -571,7 +571,7 @@ sub setupDatabase {
$dbName = "postgres";
}
- my $dsn = sprintf( "DBI:%s:dbname=%s", $dbconf->{"type"}, $dbName );
+ my $dsn = sprintf( "DBI:%s:db=%s;host=%s;port=%d", $dbconf->{type}, $dbName, $dbconf->{hostname}, $dbconf->{port} );
my $dbh = DBI->connect( $dsn, $todbconf->{"dbAdminUser"}, $todbconf->{"dbAdminPw"} );
if ($dbh) {
InstallUtils::logger( "Database connection succeeded", "info" );
@@ -778,7 +778,7 @@ sub main {
## Create the tm_user
my $dbconf = InstallUtils::readJson($databaseConfFile);
- my $dsn = sprintf( "DBI:%s:dbname=%s", $dbconf->{"type"}, $dbconf->{"dbname"} );
+ my $dsn = sprintf( "DBI:%s:db=%s;host=%s;port=%d", $dbconf->{type}, $dbconf->{dbname}, $dbconf->{hostname}, $dbconf->{port} );
my $dbh = DBI->connect( $dsn, $todbconf->{"dbAdminUser"}, $todbconf->{"dbAdminPw"} );
my $sha1_passwd = sha1_hex( $adminconf->{"password"} );
my $sub_string = sprintf( "('%s', 4, '%s')", $adminconf->{"username"}, $sha1_passwd, $sha1_passwd );