s3: Use better retry logic.

[clinton/scripts.git] / make-account-for-fyodor-user

diff --git a/make-account-for-fyodor-user b/make-account-for-fyodor-user
index 4cd370e..74bc3b5 100755 (executable)
--- a/make-account-for-fyodor-user
+++ b/make-account-for-fyodor-user
@@ -4,25 +4,25 @@ 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
+for USERHOME in `ssh $ADMIN@fyodor.hcoop.net cd /home\; sudo 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 ======================================================================
-    echo ssh $ADMIN@fyodor.hcoop.net "cat /home/$USER/.mire-password"
-    ssh $ADMIN@fyodor.hcoop.net "cat /home/$USER/.mire-password" || \
+    echo ssh $ADMIN@fyodor.hcoop.net "sudo cat /home/$USER/.mire-password"
+    ssh $ADMIN@fyodor.hcoop.net "sudo 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)' |\
+      cat /etc/migration-prob-message |\
         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' && \
+             -s "HCoop.net automatic account creation output" $USER@hcoop.net)
+    ssh $ADMIN@fyodor.hcoop.net 'sudo 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" |\
+    (ssh $ADMIN@fyodor.hcoop.net "(sudo cat /home/$USER/.mire-password;echo)|head -n 1;(sudo 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 "sudo rm /home/$USER/.mire-password; sudo touch /home/$USER/.mire-password"
       echo == sending email to $USER@hcoop.net ====================================================
       echo w00t |\
         mail -a 'From: Adam Megacz <megacz@hcoop.net>' \