[Gforge-commits] gforge/deb-specific install-ldap.sh, 1.60, 1.61 group_dump_update.pl, 1.3, 1.4 cvs_dump_update.pl, 1.10, 1.11

[lo-lan-do]

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

Modified Files:
        install-ldap.sh group_dump_update.pl cvs_dump_update.pl 
Log Message:
Merging Branch_3_1 back into the trunk (at tag Branch_3_1-merge_5).


Index: install-ldap.sh
===================================================================
RCS file: /cvsroot/gforge/gforge/deb-specific/install-ldap.sh,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- install-ldap.sh     17 Jan 2004 18:15:08 -0000      1.60
+++ install-ldap.sh     15 Feb 2004 16:29:37 -0000      1.61
@@ -204,7 +204,7 @@
              # echo "Adding $schema"
          else
              # echo "Commenting $schema"
-             perl -pi -e "s/^include[  ]*\$schema/#Comment by GForge 
install#include   \$schema/g" /etc/ldap/slapd.conf.gforge-new
+             perl -pi -e "s/^include[  ]*$schema/#Comment by GForge 
install#include    \$schema/g" /etc/ldap/slapd.conf.gforge-new
              echo "include     $schema #Added by GForge install" >> $tmpfile
              # echo "Adding $schema"
          fi
@@ -236,6 +236,11 @@
        by dn=\"$robot_dn\" write
         by dn=\"$slapd_admin_dn\" write
        by * read
+access to dn=\"ou=mailingList,$gforge_base_dn\"
+       by dn=\"$gforge_admin_dn\" write
+       by dn=\"$robot_dn\" write
+        by dn=\"$slapd_admin_dn\" write
+       by * read
 access to dn=\"ou=cvsGroup,$gforge_base_dn\"
        by dn=\"$gforge_admin_dn\" write
        by dn=\"$robot_dn\" write

Index: group_dump_update.pl
===================================================================
RCS file: /cvsroot/gforge/gforge/deb-specific/group_dump_update.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- group_dump_update.pl        6 Nov 2003 23:03:34 -0000       1.3
+++ group_dump_update.pl        15 Feb 2004 16:29:37 -0000      1.4
@@ -106,9 +106,21 @@
 #############################
 sub update_group {
        my ($gid, $gname, $userlist) = @_;
-       my ($p_gname, $p_junk, $p_gid, $p_userlist, $counter);
+       my ($log_dir, $cgi_dir, $ht_dir);
        
+       $group_dir = $grpdir_prefix.$gname;
+       $log_dir = $group_dir."/log";
+       $cgi_dir = $group_dir."/cgi-bin";
+       $ht_dir = $group_dir."/htdocs";
+
        if ($verbose) {print("Updating Group: $gname\n")};
+               
+       system("chmod 2775 $group_dir");
+       system("chmod 2775 $log_dir");
+       system("chmod 2775 $cgi_dir");
+       system("chmod 2775 $ht_dir");
+       chown $dummy_uid, $gid, ($group_dir, $log_dir, $cgi_dir, $ht_dir);
+       
 }
 
 #############################

Index: cvs_dump_update.pl
===================================================================
RCS file: /cvsroot/gforge/gforge/deb-specific/cvs_dump_update.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- cvs_dump_update.pl  18 May 2003 19:31:41 -0000      1.10
+++ cvs_dump_update.pl  15 Feb 2004 16:29:37 -0000      1.11
@@ -81,7 +81,7 @@
                print ("ERROR: $group_name home dir $grpdir_prefix$group_name 
doesn't exists\n");
                print ("        but use_cvs=$use_cvs\tstatus=$status\n");
        }
-       if ($cvs_exists && !$group_exists) {
+       if ($cvs_exists && !$group_exists && $status eq 'A') {
                print ("ERROR: CVS $cvs_root$group_name/CVSROOT exists\n");
                print ("        but no $group_name home dir at 
$grpdir_prefix$group_name\n");
                print ("        use_cvs=$use_cvs\tstatus=$status\n");