You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by fr...@apache.org on 2017/04/20 18:39:54 UTC

[05/44] incubator-trafficcontrol git commit: changed database driver to Pg

changed database driver to Pg

(cherry picked from commit bd79a22f45555bcdf37ca202b643a20b7a502c32)


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/a8c36d64
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/a8c36d64
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/a8c36d64

Branch: refs/heads/2.0.x
Commit: a8c36d6444fba0c4851ce8a0202143270c4d4126
Parents: 8dcc72d
Author: PeterRyder <pe...@gmail.com>
Authored: Mon Feb 6 17:13:07 2017 -0500
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Wed Apr 19 15:34:01 2017 -0600

----------------------------------------------------------------------
 traffic_ops/install/bin/input.json  | 2 +-
 traffic_ops/install/bin/postinstall | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a8c36d64/traffic_ops/install/bin/input.json
----------------------------------------------------------------------
diff --git a/traffic_ops/install/bin/input.json b/traffic_ops/install/bin/input.json
index 85c4d03..f381a5f 100644
--- a/traffic_ops/install/bin/input.json
+++ b/traffic_ops/install/bin/input.json
@@ -1,7 +1,7 @@
 {
   "/opt/traffic_ops/app/conf/production/database.conf":[
     {
-      "Database type":"pg",
+      "Database type":"Pg",
       "config_var":"type"
     },
     {

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a8c36d64/traffic_ops/install/bin/postinstall
----------------------------------------------------------------------
diff --git a/traffic_ops/install/bin/postinstall b/traffic_ops/install/bin/postinstall
index ecffe08..634a405 100755
--- a/traffic_ops/install/bin/postinstall
+++ b/traffic_ops/install/bin/postinstall
@@ -88,7 +88,7 @@ my $automatic = 0;
 my $defaultInputs;
 
 sub getDbDriver {
-    return "pg";
+    return "Pg";
 }
 
 sub getInstallPath {
@@ -574,7 +574,7 @@ sub setupDatabase {
         InstallUtils::logger( "Database initialization succeeded", "info" );
     }
 
-    my $dsn = sprintf( "DBI:mysql:%s:%s:%s", "mysql", $dbconf->{"hostname"}, $dbconf->{"port"} );
+    my $dsn = sprintf( "DBI:Pg:%s:%s:%s", "Pg", $dbconf->{"hostname"}, $dbconf->{"port"} );
     my $dbh = DBI->connect( $dsn, $todbconf->{"dbAdminUser"}, $todbconf->{"dbAdminPw"} );
     if ($dbh) {
         InstallUtils::logger("Database connection succeeded", "info");