[Gforge-commits] gforge/deb-specific prepare-vhosts-file.pl, 1.2, 1.3

[cbayle]

Update of /cvsroot/gforge/gforge/deb-specific
In directory db.perdue.net:/tmp/cvs-serv7594/deb-specific

Modified Files:
        prepare-vhosts-file.pl 
Log Message:
Connect to db without passwd


Index: prepare-vhosts-file.pl
===================================================================
RCS file: /cvsroot/gforge/gforge/deb-specific/prepare-vhosts-file.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- prepare-vhosts-file.pl      4 Mar 2004 23:53:05 -0000       1.2
+++ prepare-vhosts-file.pl      28 Mar 2004 19:47:45 -0000      1.3
@@ -3,9 +3,9 @@
 use DBI;
 use File::Temp ;
 use strict ;
-use vars qw/$dbh $ifile $ofile @ilist %hash $key $val $cur $line $token/ ;
+use vars qw/$dbh $ifile $ofile @ilist %hash $key $val $cur $line $dbh 
$sys_dbname $token/ ;
 
-require("/usr/lib/gforge/lib/include.pl");  # Include all the predefined 
functions
+require("/etc/gforge/local.pl");  # Include all the predefined functions
 
 %hash = () ;
 
@@ -18,7 +18,8 @@
 }
 close CONF ;
 
-&db_connect;
+$dbh ||= DBI->connect("DBI:Pg:dbname=$sys_dbname");
+die "Cannot connect to database: $!" if ( ! $dbh );
 
 $ifile = '/etc/gforge/templates/httpd.vhosts' ;
 $ofile = '/var/lib/gforge/etc/httpd.vhosts' ;