[Gforge-commits] gforge/deb-specific fix-mailing-lists.pl, 1.2, 1.3 create-vhosts.sh, 1.5, 1.6

[cbayle]

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

Modified Files:
        fix-mailing-lists.pl create-vhosts.sh 
Log Message:
Don't require passwd to connect db


Index: fix-mailing-lists.pl
===================================================================
RCS file: /cvsroot/gforge/gforge/deb-specific/fix-mailing-lists.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fix-mailing-lists.pl        19 Jun 2003 00:33:57 -0000      1.2
+++ fix-mailing-lists.pl        28 Mar 2004 19:49:29 -0000      1.3
@@ -10,16 +10,16 @@
 use diagnostics ;
 use File::Temp qw/ :mktemp  /;
 
-use vars qw/ $dbh $sys_lists_host $domain_name / ;
+use vars qw/ $dbh $sys_lists_host $sys_dbname $domain_name / ;
 
 use vars qw// ;
 
 sub debug ( $ ) ;
 
-require ("/usr/lib/gforge/lib/include.pl") ; # Include all the predefined 
functions 
 require ("/etc/gforge/local.pl") ;
 
-&db_connect ;
+$dbh ||= DBI->connect("DBI:Pg:dbname=$sys_dbname");
+die "Cannot connect to database: $!" if ( ! $dbh );
 
 $dbh->{AutoCommit} = 0;
 $dbh->{RaiseError} = 1;

Index: create-vhosts.sh
===================================================================
RCS file: /cvsroot/gforge/gforge/deb-specific/create-vhosts.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- create-vhosts.sh    4 Mar 2004 13:49:10 -0000       1.5
+++ create-vhosts.sh    28 Mar 2004 19:49:29 -0000      1.6
@@ -2,7 +2,7 @@
 
 set -e
 
-/usr/lib/gforge/bin/prepare-vhosts-file.pl
+su -s /bin/sh gforge -c /usr/lib/gforge/bin/prepare-vhosts-file.pl
 if [ -x /usr/sbin/apache ]; then
     /usr/sbin/invoke-rc.d apache reload > /dev/null 2>&1
 fi