X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=bin%2Fmo-create-logins;h=bd99400e7fb678d6ef02d2f6087c733bb0223d92;hb=5fca32af49d84dcadf96317d54708c20a41ba151;hp=765c5653c5cd9dcb4d0500aa88356ca4caec56d0;hpb=2230f30e883e7fce287a65742afacddde69e16c9;p=eval.git

diff --git a/bin/mo-create-logins b/bin/mo-create-logins
index 765c565..bd99400 100755
--- a/bin/mo-create-logins
+++ b/bin/mo-create-logins
@@ -13,20 +13,32 @@ case "$mode" in
 esac
 
 >>etcshadow >>etcpasswd >>etcgroup
+expire=$((`date +%s` / 86400 - 1))
 
 case $mode in
   eval)
-    echo -n Enter password for mo-eval:
+    echo -n Enter password for evaluation users:
     read passwd
     passwd=`echo $passwd | bin/md5crypt`
-    echo $EVAL_USER:x:$uid:$uid:MO Evaluator:$MO_ROOT/eval/$EVAL_USER:/bin/bash >> etcpasswd
-    echo $EVAL_GROUP:x:$uid:							>> etcgroup
-    echo $EVAL_USER:$passwd:$((`date +%s` / 86400 - 1)):0:99999:7:::		>> etcshadow
-    tuid=$(($uid + 1))
+    gid=$uid
+    tgid=$(($gid+1))
+    rgid=$(($gid+2))
+    echo $EVAL_USER:x:$uid:$gid:MO Evaluator:$MO_ROOT/eval/eval:/bin/bash >> etcpasswd
+    echo $EVAL_USER:$passwd:$expire:0:99999:7:::		>> etcshadow
+    echo $EVAL_GROUP:x:$gid:					>> etcgroup
+    echo $TEST_GROUP:x:$tgid:$EVAL_USER				>> etcgroup
+
+    if [ -n "$REMOTE_SUBMIT" ] ; then
+      uid=$(($uid + 1))
+      echo $REMOTE_SUBMIT_USER:x:$uid:$rgid:MO Submitter:$MO_ROOT/eval/submit:/bin/bash	>> etcpasswd
+      echo $REMOTE_SUBMIT_USER:$passwd:$expire:0:99999:7:::				>> etcshadow
+      echo $REMOTE_SUBMIT_GROUP:x:$rgid:						>> etcgroup
+    fi
 
+    tuid=$(($uid + 1))
     for tester in $TEST_USERS; do
-      echo $tester:x:$tuid:$uid:MO Tester `expr $tuid - $uid`:$MO_ROOT/eval/$tester:/bin/bash	>> etcpasswd
-      echo $tester:$passwd:$((`date +%s` / 86400 - 1)):0:99999:7:::				>> etcshadow
+      echo $tester:x:$tuid:$tgid:MO Tester `expr $tuid - $uid`:$MO_ROOT/eval/$tester:/bin/bash	>> etcpasswd
+      echo $tester:$passwd:$expire:0:99999:7:::				>> etcshadow
       tuid=$(($tuid + 1))
     done
   ;;
@@ -35,10 +47,10 @@ case $mode in
 #   if [ -f logins.tex ]; then echo "File logins.tex exists! Bailing out!"; exit 1; fi
     cat > logins.tex <<- EOF
 	\\nopagenumbers
-	\\font\\next=cstt17\\next
-	\\raggedright
-	\\parindent=0pt
-	\\def\\user#1#2{\\vbox to 3cm{\\hsize=5cm \\vss#1\\vss#2\\vss}}
+	\\voffset=-1.5cm\\vsize=280mm\\hoffset=-0.75cm\\advance\\hsize by 3cm
+	\\raggedright\\parindent=0pt
+	\\font\next=cstt17\next
+	\\def\\user#1#2{\\vbox to 4.5cm{\\hsize=6cm\\vss\\vss{\\font\\next=csti17\\next Contest, day 1}\\vss\\vss#1\\vss#2\\vss\\vss}}
 	\\leavevmode
 	EOF