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:40:32 UTC
[43/44] incubator-trafficcontrol git commit: no superuser for seeds
no superuser for seeds
(cherry picked from commit 4c40ae8d4e729ebf6783553db31744f00e022f1c)
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/c3211a7d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/c3211a7d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/c3211a7d
Branch: refs/heads/2.0.x
Commit: c3211a7d325034f3e59aeb10d790553bbe6db99a
Parents: cddedc7
Author: Dan Kirkwood <da...@gmail.com>
Authored: Wed Apr 19 15:11:57 2017 -0600
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Wed Apr 19 16:58:04 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/c3211a7d/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";
}
}