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/19 22:09:13 UTC

[1/2] incubator-trafficcontrol git commit: no superuser for seeds

Repository: incubator-trafficcontrol
Updated Branches:
  refs/heads/master 4c176109c -> b31c9bffd


no superuser for seeds


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

Branch: refs/heads/master
Commit: 4c40ae8d4e729ebf6783553db31744f00e022f1c
Parents: 4c17610
Author: Dan Kirkwood <da...@gmail.com>
Authored: Wed Apr 19 15:11:57 2017 -0600
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Wed Apr 19 16:08:19 2017 -0600

----------------------------------------------------------------------
 traffic_ops/app/db/admin.pl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/4c40ae8d/traffic_ops/app/db/admin.pl
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/admin.pl b/traffic_ops/app/db/admin.pl
index aa181e8..658ea01 100755
--- a/traffic_ops/app/db/admin.pl
+++ b/traffic_ops/app/db/admin.pl
@@ -181,14 +181,16 @@ sub migrate {
 
 sub seed {
 	print "Seeding database.\n";
-	if ( system("psql -h $host_ip -p $host_port -d $db_name -U $db_super_user -e < db/seeds.sql") != 0 ) {
+	local $ENV{PGPASSWORD} = $db_password;
+	if ( system("psql -h $host_ip -p $host_port -d $db_name -U $db_user -e < db/seeds.sql") != 0 ) {
 		die "Can't seed database\n";
 	}
 }
 
 sub load_schema {
 	print "Creating database tables.\n";
-	if ( system("psql -h $host_ip -p $host_port -d $db_name -U $db_super_user -e < db/create_tables.sql") != 0 ) {
+	local $ENV{PGPASSWORD} = $db_password;
+	if ( system("psql -h $host_ip -p $host_port -d $db_name -U $db_user -e < db/create_tables.sql") != 0 ) {
 		die "Can't create database tables\n";
 	}
 }


[2/2] incubator-trafficcontrol git commit: This closes #489

Posted by mi...@apache.org.
This closes #489


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

Branch: refs/heads/master
Commit: b31c9bffdc224205f89f7d30253e9ad8b58d98a2
Parents: 4c40ae8
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Wed Apr 19 16:08:37 2017 -0600
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Wed Apr 19 16:08:37 2017 -0600

----------------------------------------------------------------------

----------------------------------------------------------------------