create-user: misc updates for Debian Stretch / server changes

[hcoop/scripts.git] / new-user

diff --git a/new-user b/new-user
index 86a5692..bf3ca2e 100755 (executable)
--- a/new-user
+++ b/new-user
@@ -14,7 +14,7 @@ if test -z "$REALNM"; then
        exit 1
 fi
 
-INITPW=$(sudo -u hcoop psql -p 5433 hcoop_portal3 -tc "select unix_passwd from MemberApp where name = '${USERNM}' order by id desc limit 1;")
+INITPW=$(sudo -u hcoop psql -h postgres -p 5433 hcoop_portal3 -tc "select unix_passwd from MemberApp where name = '${USERNM}' order by id desc limit 1;")
 
 
 #
@@ -43,7 +43,7 @@ if test -z "$INITPW"; then
 else
        echo Setting password from database
        actual_user=`whoami`
-       sudo sh -c "echo $INITPW | tee -| /afs/hcoop.net/common/etc/scripts/change-user-password $USERNM" || \
+       sudo sh -c "printf '%s\n%s\n' $INITPW $INITPW  | /afs/hcoop.net/common/etc/scripts/change-user-password $USERNM" || \
        ( echo "echo XXX | tee - | change-user-password $USERNM failed" && exit 5 )
 fi