Changeset 844 for trunk

Timestamp:

04/12/16 18:32:17 (8 years ago)

Author:

Kris Deugau

Message:

/trunk

Add a hack to slurp the DB connect info from MyIPDB.pm in db-update.pl,
so we don't have to maintain the info twice and make a mess of it.

Location:

trunk/cgi-bin

Files:

• MyIPDB.pm (modified) (1 diff)
• db-update.pl (modified) (1 diff)

trunk/cgi-bin/MyIPDB.pm

@@ -22 +22 @@
 # DB host is optional.
 my $dbhost = 'localhost';
+##fixme:  need better way to export the variables above for db-update
+sub dbname { $dbname }
+sub dbuser { $dbuser }
+sub dbpass { $dbpass }
+sub dbhost { $dbhost }
 
 # ACL for RPC shim.  A hash of arrays;  the hash keys are the remote system

trunk/cgi-bin/db-update.pl

@@ -9 +9 @@
 
 # run the tabledef update first.  This is "safe";  IPDB < 3.0 can still happily munch away at it.
-print qx { PGPASSWORD=ipdbpwd psql -h localhost -U ipdb ipdb <ipdb-2.7-3.0.sql };
+##fixme
+my $sqlcmd = "PGPASSWORD=".dbpass()." psql -h ".dbhost()." -U ".dbuser()." ".dbname()." <ipdb-2.7-3.0.sql";
+print qx $sqlcmd;
 
 my $dbh;