[Gforge-commits] gforge/deb-specific install-exim4.sh, 1.2, 1.3 install-db.sh, 1.32, 1.33 gforge-config, 1.7, 1.8

[lo-lan-do]

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

Modified Files:
        install-exim4.sh install-db.sh gforge-config 
Log Message:
Started removing LDAP dependency (to be replaced with direct
PostgreSQL lookups).


Index: install-exim4.sh
===================================================================
RCS file: /cvsroot/gforge/gforge/deb-specific/install-exim4.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- install-exim4.sh    1 Mar 2004 17:02:13 -0000       1.2
+++ install-exim4.sh    26 Oct 2004 20:31:25 -0000      1.3
@@ -96,6 +96,8 @@
 # You may move this block around to accomodate your local needs as long as you
 # keep it in the Directors Configuration section (between the second and the
 # third occurences of a line containing only the word \"end\")
+
+hide pgsql_servers = $db_host/$db_name/gforge_nss/''
 forward_for_gforge:
   domains = users.$domain_name
   driver = redirect

Index: install-db.sh
===================================================================
RCS file: /cvsroot/gforge/gforge/deb-specific/install-db.sh,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- install-db.sh       3 Oct 2004 17:01:38 -0000       1.32
+++ install-db.sh       26 Oct 2004 20:31:25 -0000      1.33
@@ -64,8 +64,8 @@
             # PostgreSQL configuration for versions from 7.3 on
            echo "Configuring for PostgreSQL 7.3"
            cp -a /etc/postgresql/pg_hba.conf 
/etc/postgresql/pg_hba.conf.gforge-new
+           cur=$(mktemp /tmp/$pattern)
            if ! grep -q 'BEGIN GFORGE BLOCK -- DO NOT EDIT' 
/etc/postgresql/pg_hba.conf.gforge-new ; then
-               cur=$(mktemp /tmp/$pattern)
                # Make sure our configuration is inside a delimited BLOCK
                if grep -q "^host.*gforge_passwd$" 
/etc/postgresql/pg_hba.conf.gforge-new ; then
                    perl -e "open F, \"/etc/postgresql/pg_hba.conf.gforge-new\" 
or die \$!; undef \$/; \$l=<F>; \$l=~ s/^host.*gforge_passwd\$/### BEGIN GFORGE 
BLOCK -- DO NOT EDIT\n### END GFORGE BLOCK -- DO NOT EDIT/s; print \$l;" > $cur
@@ -78,6 +78,10 @@
                    cat $cur > /etc/postgresql/pg_hba.conf.gforge-new
                fi
            fi
+           echo "### BEGIN GFORGE BLOCK -- DO NOT EDIT" > $cur
+           echo "### END GFORGE BLOCK -- DO NOT EDIT" >> $cur
+           cat /etc/postgresql/pg_hba.conf.gforge-new >> $cur
+           cat $cur > /etc/postgresql/pg_hba.conf.gforge-new
            rm -f $cur
            
            cur=$(mktemp /tmp/$pattern)

Index: gforge-config
===================================================================
RCS file: /cvsroot/gforge/gforge/deb-specific/gforge-config,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- gforge-config       25 Oct 2004 14:39:51 -0000      1.7
+++ gforge-config       26 Oct 2004 20:31:25 -0000      1.8
@@ -11,12 +11,11 @@
 [ -f /etc/default/apache2 ] && . /etc/default/apache2
 if [ "x$NO_START" == "x0" ]
 then
-       /usr/lib/gforge/bin/setup -fhs -noapache -dovhost -system LDAP 
-nolisten80
+       /usr/lib/gforge/bin/setup -fhs -noapache -dovhost -system pgsql 
-nolisten80
 else
-       /usr/lib/gforge/bin/setup -fhs -noapache -dovhost -system LDAP -listen80
+       /usr/lib/gforge/bin/setup -fhs -noapache -dovhost -system pgsql 
-listen80
 fi     
 
-
 [ -f /etc/gforge/local.inc ] && chmod 644 /etc/gforge/local.inc
 [ -f /etc/gforge/httpd.conf ] && chmod 644 /etc/gforge/httpd.conf