configure zfs quota and uid/git for shares

[cloudstore.git] / create-user.sh

diff --git a/create-user.sh b/create-user.sh
index 244d6f9..52bd56b 100755 (executable)
--- a/create-user.sh
+++ b/create-user.sh
@@ -1,14 +1,13 @@
-#!/bin/sh -xe
+#!/bin/sh -e
 
 . ./env.sh
 
 email=$1
 password=$2
 quota=$3
-host=$4
 
 if [ -z "$email" -o -z "$password" ]; then
-       echo "Usage: $0 email password [quota] [host]"
+       echo "Usage: $0 email password [quota]"
        exit 1
 fi
 
@@ -33,8 +32,7 @@ if [ ! -e $SLICE/$uid ] ; then
 fi
 
 secrets="$SLICE/$uid/.secrets"
-test ! -z "$host" && login="$login+$host"
-grep "^$login:" $secrets || echo "$login:$password" >> $secrets
+grep "^u$uid:" $secrets || echo "u$uid:$password" >> $secrets
 md5mail=`echo -n $email | md5sum | cut -d" " -f1`
 md5passwd=`echo -n $password | md5sum | cut -d" " -f1`
 grep "^$md5mail:" $secrets || echo "$md5mail:$md5passwd" >> $secrets
@@ -42,3 +40,4 @@ grep "^$md5mail:" $secrets || echo "$md5mail:$md5passwd" >> $secrets
 id u$uid
 zfs get userquota@u$uid $ZSLICE
 zfs get userused@u$uid $ZSLICE
+cat $secrets