--- loncom/build/make_domain_coordinator.pl	2003/02/03 18:03:52	1.9
+++ loncom/build/make_domain_coordinator.pl	2006/10/08 23:05:18	1.11
@@ -11,7 +11,7 @@ make_domain_coordinator.pl - Make a doma
 # The LearningOnline Network
 # make_domain_coordinator.pl - Make a domain coordinator on a system
 #
-# $Id: make_domain_coordinator.pl,v 1.9 2003/02/03 18:03:52 harris41 Exp $
+# $Id: make_domain_coordinator.pl,v 1.11 2006/10/08 23:05:18 raeburn Exp $
 #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
 #
@@ -33,8 +33,6 @@ make_domain_coordinator.pl - Make a doma
 #
 # http://www.lon-capa.org/
 #
-# YEAR=2002
-#
 ###
 
 =pod
@@ -91,10 +89,8 @@ Set roles.hist and roles.db
 
 # ---------------------------------------------------- Configure general values
 
-my %perlvar; # Holds network-wide and machine-specific configuration values.
-# We only need one configuration value however, lonUsersDir.  Rather than
-# read this out of loncapa.conf, I am just going to hard-code this for now.
-$perlvar{'lonUsersDir'}='/home/httpd/lonUsers';
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
 
 =pod
 
@@ -179,7 +175,7 @@ if (-d "/home/$username") {
     die ('**** ERROR **** '.$username.' is already a linux operating system '.
 	 'user.'."\n".$caveat);
 }
-my $udpath=propath($domain,$username);
+my $udpath=&propath($domain,$username);
 if (-d $udpath) {
     die ('**** ERROR **** '.$username.' is already defined as a LON-CAPA '.
 	 'user.'."\n".$caveat);
@@ -233,11 +229,59 @@ if ($< != 0) { # Am I root?
 
 =cut
 
+# ----------------------------------------------------------- /usr/sbin/groupadd
+# -- Add group
+$username=~s/\W//g; # an extra filter, just to be sure
+
+print "adding group: $username \n";
+my $status = system('/usr/sbin/groupadd', $username);
+if ($status) {
+    die "Error.  Something went wrong with the addition of group ".
+          "\"$username\".\n";
+}
+my $gid = getgrnam($username);
+
 # ----------------------------------------------------------- /usr/sbin/useradd
+# -- Add user
 
-$username=~s/\W//g; # an extra filter, just to be sure
-`/usr/sbin/useradd $username`; # Add the user with the 'useradd' command.
+print "adding user: $username \n";
+my $status = system('/usr/sbin/useradd','-c','LON-CAPA user','-g',$gid,$username);
+if ($status) {
+    system("/usr/sbin/groupdel $username");
+    die "Error.  Something went wrong with the addition of user ".
+          "\"$username\".\n";
+}
 
+print "Done adding user\n";
+# Make www a member of that user group.
+my $groups=`/usr/bin/groups www`;
+# untaint
+my ($safegroups)=($groups=~/:\s*([\s\w]+)/);
+$groups=$safegroups;
+chomp $groups; $groups=~s/^\S+\s+\:\s+//;
+my @grouplist=split(/\s+/,$groups);
+my @ugrouplist=grep {!/www|$username/} @grouplist;
+my $gl=join(',',(@ugrouplist,$username));
+print "Putting www in user's group\n";
+if (system('/usr/sbin/usermod','-G',$gl,'www')) {
+    die "Error. Could not make www a member of the group ".
+          "\"$username\".\n";
+}
+
+# Check if home directory exists for user
+# If not, create one.
+if (!-e "/home/$username") {
+    if (!mkdir("/home/$username",0710)) {
+        print "Error. Could not add home directory for ".
+          "\"$username\".\n";
+    }
+}
+
+if (-d "/home/$username") {
+    system('/bin/chown',"$username:$username","/home/$username");
+    system('/bin/chmod','-R','0660',"/home/$username");
+    system('/bin/chmod','0710',"/home/$username");
+}
 =pod
 
 =item 3 (as root). enter in a password
@@ -323,18 +367,19 @@ close(OUT);
 =cut
 
 use GDBM_File; # A simplistic key-value pairing database.
-my %hash;
 
-tie(%hash,'GDBM_File',"$udpath/roles.db",
-    &GDBM_WRCREAT,0640); # Interface with GDBM database thru a hash variable.
-
-$hash{'/'.$domain.'/_dc'}='dc'; # Set the domain coordinator role.
+my $rolesref=&LONCAPA::locking_hash_tie("$udpath/roles.db",&GDBM_WRCREAT());
+if (!$rolesref) {
+    die('unable to tie roles db: '."$udpath/roles.db");
+}
+$rolesref->{'/'.$domain.'/_dc'}='dc'; # Set the domain coordinator role.
 open(OUT, ">$udpath/roles.hist"); # roles.hist is the synchronous plain text.
-map {
-    print(OUT $_.' : '.$hash{$_}."\n");
-} keys %hash;
+foreach my $key (keys(%{$rolesref})) {
+    print(OUT $key.' : '.$rolesref->{$key}."\n");
+}
 close(OUT);
-untie(%hash); # Finish interfacing with GDBM database.
+&LONCAPA::locking_hash_untie($rolesref);
+
 
 `chown www:www $udpath/roles.hist`; # Must be writeable by httpd process.
 `chown www:www $udpath/roles.db`; # Must be writeable by httpd process.
@@ -354,18 +399,6 @@ my $hostname=`hostname`; chomp($hostname
 print("http://$hostname/adm/createuser will allow you to further define".
       " this user.\n"); # Output a suggested URL.
 
-# ================================================================= SUBROUTINES
-# Subroutine propath: take in domain and username, and generate filesystem path
-sub propath {
-    my ($udom,$uname)=@_; # The lonDefDomain, and the domain coord. username.
-    $udom =~ s/\W//g; # Taint removal.
-    $uname =~ s/\W//g; # Taint removal.
-    my $subdir = $uname.'__';
-    $subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/; # The path must have three subdirs.
-    my $proname = "$perlvar{'lonUsersDir'}/$udom/$subdir/$uname"; # Total path.
-    return $proname; # Return the total user directory filesystem path.
-}
-
 =pod
 
 =head1 AUTHOR