[Gforge-commits] gforge/deb-specific install-ldap.sh, 1.59, 1.60 httpd.common.template, 1.4, 1.5

[lo-lan-do]

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

Modified Files:
        install-ldap.sh httpd.common.template 
Log Message:
Merging Branch_3_1 back into the trunk (at tag Branch_3_1-merge_4).


Index: install-ldap.sh
===================================================================
RCS file: /cvsroot/gforge/gforge/deb-specific/install-ldap.sh,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- install-ldap.sh     10 Jan 2004 22:14:05 -0000      1.59
+++ install-ldap.sh     17 Jan 2004 18:15:08 -0000      1.60
@@ -317,7 +317,7 @@
        tmpldifadd=$(mktemp $tmpfile_pattern)
        tmpldifmod=$(mktemp $tmpfile_pattern)
        dc=$(echo $gforge_base_dn | cut -d, -f1 | cut -d= -f2)
-       echo >> $tmpldif <<EOF
+       cat >> $tmpldif <<EOF
 dn: $sys_ldap_base_dn
 dc: $dc
 objectClass: top
@@ -418,7 +418,7 @@
        tmpldif=$(mktemp $tmpfile_pattern)
        tmpldifadd=$(mktemp $tmpfile_pattern)
        tmpldifmod=$(mktemp $tmpfile_pattern)
-       echo > $tmpldif <<-FIN
+       cat > $tmpldif <<-FIN
 dn: $gforge_base_dn
 objectClass: domain
 dc: $dc
@@ -478,8 +478,8 @@
 
 FIN
        
-       if ! eval "ldapadd -r -c -D '$slapd_admin_dn' -x 
-w'$slapd_admin_passwd' > $tmpldifadd 2>&1" < $tmpldif ; then
-           if ! eval "ldapmodify -r -c -D '$slapd_admin_dn' -x 
-w'$slapd_admin_passwd' > $tmpldifadd 2>&1" < $tmpldif ; then
+       if ! eval "ldapadd -r -c -D '$slapd_admin_dn' -x 
-w'$slapd_admin_passwd' -f $tmpldif > $tmpldifadd 2>&1" ; then
+           if ! eval "ldapmodify -r -c -D '$slapd_admin_dn' -x 
-w'$slapd_admin_passwd' -f $tmpldif > $tmpldifadd 2>&1" ; then
                echo "WARNING WARNING WARNING Something wrong happened when 
setting up the robot"
                echo "please check and report following error"
                echo 
========================================================================================

Index: httpd.common.template
===================================================================
RCS file: /cvsroot/gforge/gforge/deb-specific/httpd.common.template,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- httpd.common.template       24 Jul 2003 19:31:11 -0000      1.4
+++ httpd.common.template       17 Jan 2004 18:15:08 -0000      1.5
@@ -5,11 +5,6 @@
   deny from all
 </Files>
 
-<IfModule mod_ssl.c>
-  Listen 80
-  Listen 443
-</IfModule>
-
 NameVirtualHost {ip_address}:80
 NameVirtualHost {ip_address}:443