X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=bin%2Fmo-install;h=f580d69e8962c1689b84056e57b22c7124d6cd92;hb=65ff89923436ec785ce2b35d26827aa95ce8c3ce;hp=e362614bf789ded5029929f0b09f567b44f4af55;hpb=283214723416710aaf5d94b9c1e3527fa6f1208e;p=eval.git

diff --git a/bin/mo-install b/bin/mo-install
index e362614..f580d69 100755
--- a/bin/mo-install
+++ b/bin/mo-install
@@ -1,47 +1,35 @@
-#!/bin/sh
+#!/bin/bash
 
-[ -f config ] || ( echo "Missing config file, check cwd." ; exit 1 )
+[ -f config ] || { echo "Missing config file, check cwd." ; exit 1 ; }
 set -e
 . config
+make
 
 H=`pwd`
-cd $MO_ROOT
 
 # mo-eval home
+cd $MO_ROOT
+rm -rf eval
+mkdir eval
+chgrp $EVAL_GROUP eval
+chmod 550 eval
+cd eval
 echo "Creating $EVAL_USER"
-rm -rf ./$EVAL_USER
 mkdir $EVAL_USER
 cd $EVAL_USER
 cp -a $H/* .
-mv bin/profile .profile
 chmod +x bin/*
 cd ..
 chown -R $EVAL_USER.$EVAL_GROUP $EVAL_USER
 chmod 700 $EVAL_USER
 
-# mo-test home
-for u in $TEST_USERS ; do
-	echo "Creating $u"
-	rm -rf ./$u
-	mkdir $u
-	chown $u.$EVAL_GROUP $u
-	chmod 770 $u
-	cp $EVAL_USER/bin/box $EVAL_USER/bin/box-$u
-	chown $u.$EVAL_GROUP $EVAL_USER/bin/box-$u
-	chmod 4550 $EVAL_USER/bin/box-$u
-	done
+( cd $EVAL_USER ; bin/mo-create-testusers )
 
-# common
-echo "Creating common"
-rm -rf common
-mkdir common
-cd common
-cd ..
-chown -R $EVAL_USER.$EVAL_GROUP common
-chmod 750 $EVAL_USER
+# create public
+cd $MO_ROOT
+echo "Creating public"
+rm -rf public
+mkdir public
 
-# SSH keys (FIXME)
-echo "Copying SSH keys"
-mkdir $EVAL_USER/.ssh
-cp ~mj/.ssh/authorized_keys $EVAL_USER/.ssh/
-chown -R $EVAL_USER $EVAL_USER/.ssh
+# populate public
+( cd eval/$EVAL_USER ; bin/mo-create-public )