X-Git-Url: http://git.hcoop.net/clinton/scripts.git/blobdiff_plain/6e5619be8f42399a3a07345f0c9c96238df831b3..4f00b3491030adbecd67e711d0e42d51dffac4c0:/make-account-for-fyodor-user

diff --git a/make-account-for-fyodor-user b/make-account-for-fyodor-user
index 94cd696..4cd370e 100755
--- a/make-account-for-fyodor-user
+++ b/make-account-for-fyodor-user
@@ -2,19 +2,33 @@
 
 ADMIN=`whoami | sed s/_.*//`
 echo "assuming that I am $ADMIN@fyodor..."
+export PATH=/afs/hcoop.net/common/etc/scripts/:$PATH
 
 for USERHOME in `ssh $ADMIN@fyodor.hcoop.net cd /home\; find */.mire-password -size +0`; do
   USER=`dirname $USERHOME`
   PATHBITS=`echo $USER | head -c 1`/`echo $USER | head -c 2`/$USER
 
   echo == creating user $USER ======================================================================
-  (ssh $ADMIN@fyodor.hcoop.net cat /home/$USER/.mire-password\; cat /home/$USER/.mire-password) | \
-    /afs/hcoop.net/common/etc/scripts/create-user $USER && (
-      echo == account created successfully ========================================================
+    echo ssh $ADMIN@fyodor.hcoop.net "cat /home/$USER/.mire-password"
+    ssh $ADMIN@fyodor.hcoop.net "cat /home/$USER/.mire-password" || \
+     (echo == sending complaint to $USER@hcoop.net ====================================================;\
+      echo 'please have a fyodor admin fix it (Adam Megacz is not a fyodor admin)' |\
+        mail -a 'From: Adam Megacz <megacz@hcoop.net>' \
+             -c admins@hcoop.net \
+             -s "you have damaged the permissions on your ~/.mire-password" $USER@hcoop.net)
+    ssh $ADMIN@fyodor.hcoop.net 'cat /home/$USER/.mire-password' && \
+    create-user $USER && \
+    (ssh $ADMIN@fyodor.hcoop.net "(cat /home/$USER/.mire-password;echo)|head -n 1;(cat /home/$USER/.mire-password;echo)|head -n 1" |\
+     change-user-password "$USER") && \
+     (echo == account created successfully ========================================================
       echo == deleting .mire-password =============================================================
-      ssh $ADMIN@fyodor.hcoop.net 'echo -n > /home/$USER/.mire-password'
+      ssh $ADMIN@fyodor.hcoop.net "echo -n > /home/$USER/.mire-password"
       echo == sending email to $USER@hcoop.net ====================================================
-      mail -s 'your account on mire.hcoop.net has been created' $USER@hcoop.net <<EOF
+      echo w00t |\
+        mail -a 'From: Adam Megacz <megacz@hcoop.net>' \
+             -s "account created for user $USER" admins@hcoop.net
+      mail -a 'From: Adam Megacz <megacz@hcoop.net>' \
+           -s 'your account on mire.hcoop.net has been created' $USER@hcoop.net <<EOF
 Enjoy!
 
 ______________________________________________________________________________