From: Clinton Ebadi <clinton@unknownlamer.org>
Date: Mon, 21 Feb 2011 10:29:36 +0000 (-0500)
Subject: Sync changes in current working tree
X-Git-Url: http://git.hcoop.net/clinton/scripts.git/commitdiff_plain/3a9bd77a91c7228ac90171603a9260337a9e9bfb?hp=ffb13c17d14a4a00908272cfa41cd63e8c858a10

Sync changes in current working tree
---

diff --git a/change-user-password b/change-user-password
index 78cb621..b011c1f 100755
--- a/change-user-password
+++ b/change-user-password
@@ -15,7 +15,7 @@ sudo kadmin.local -p root/admin -q "cpw $USER@HCOOP.NET" \
 cat /tmp/kadmin.out | grep '\(is too short while changing\|does not contain enough\)' && \
      (echo == sending complaint to $USER@hcoop.net ====================================================;\
       echo 'please change it' |\
-        mail -a 'From: Adam Megacz <megacz@hcoop.net>' \
+        mail -a 'From: HCoop Admins <admins@hcoop.net>' \
              -c admins@hcoop.net \
              -s "your ~/.mire-password is too short or not complex enough" $USER@hcoop.net) || \
       true
diff --git a/create-user b/create-user
index 489e60a..7ad5114 100755
--- a/create-user
+++ b/create-user
@@ -146,18 +146,26 @@ test -e /etc/keytabs/user.daemon/$USER || \
 sudo chown $USER:www-data /etc/keytabs/user.daemon/$USER
 sudo chmod 440            /etc/keytabs/user.daemon/$USER
 
-# rsync keytabs to mire
+# rsync keytabs
 (cd /etc/keytabs
    sudo tar clpf - user.daemon/$USER | \
      ssh mire.hcoop.net cd /etc/keytabs\; sudo tar xlpf -)
+(cd /etc/keytabs
+   sudo tar clpf - user.daemon/$USER | \
+     ssh hopper.hcoop.net cd /etc/keytabs\; sudo tar xlpf -)
 
 #
 # Create/mount/set-perms on user's volumes (home, mail, databases, logs)
 #
 
 # HOME VOLUME
+if vos examine user.$USER.d 2>/dev/null; then
+	echo "Reactivating old volume (user.$USER.d)"
+	vos rename user.$USER.d user.$USER
+fi
 vos examine user.$USER 2>/dev/null || \
   vos create deleuze.hcoop.net /vicepa user.$USER -maxquota 400000
+
 mkdir -p `dirname $HOMEPATH`
 fs ls $HOMEPATH || test -L $HOMEPATH || fs mkm $HOMEPATH user.$USER
 chown $USER:nogroup $HOMEPATH
@@ -203,8 +211,13 @@ test -L /var/cache/git/$USER || \
     sudo ln -s $HOMEPATH/.hcoop-git /var/cache/git/$USER
 
 # MAIL VOLUME
+if vos examine mail.$USER.d 2>/dev/null; then
+	echo "Reactivating old volume (mail.$USER.d)"
+	vos rename mail.$USER.d mail.$USER
+fi
 vos examine mail.$USER 2>/dev/null || \
   vos create deleuze.hcoop.net /vicepa mail.$USER -maxquota 400000
+
 mkdir -p `dirname $MAILPATH`
 fs ls $MAILPATH || fs mkm $MAILPATH         mail.$USER
 fs ls $HOMEPATH/Maildir || fs mkm $HOMEPATH/Maildir mail.$USER
diff --git a/hcoop-backup b/hcoop-backup
index 6511c5a..10afd41 100755
--- a/hcoop-backup
+++ b/hcoop-backup
@@ -109,11 +109,13 @@ cat backupfiles | \
  xargs -I{} -d\\n -- bash -c "test -L '{}' || echo '{}'" > complain
 
 F=hcoop.backup.tar$COMPRESS_EXT.aescrypt
-tar clpf - --ignore-failed-read --no-recursion -C / -T backupfiles | \
+echo $COMPRESS_PROG $KEYFILE $MOVE_OVER $CURDATE $F
+echo tar clpf - --ignore-failed-read --no-recursion -C / -T backupfiles | \
   $COMPRESS_PROG | \
   ccrypt -k $KEYFILE -e | \
   $MOVE_OVER $CURDATE $F
 
+
 # Acquire lock before messing with spamd
 COUNT=0
 LOCK=/var/local/lib/spamd/.lock
@@ -138,19 +140,20 @@ rm -f $LOCK
 < $F $MOVE_OVER $CURDATE $F
 rm -f $F
 
-vos listvol deleuze | \
+vos listvol fritz | \
   tail -n +2 | \
   head -n -3 | \
-  cut -b1-34 | \
+  cut -b1-32 | \
   grep -v "\.backup .*$" | \
   grep -v "\.readonly .*$" | \
+  grep -v "\.d .*$" | \
+  grep -v not-backed-up | \
   sed 's_^ .*__' | \
   sed 's_ .*$__' | \
   grep '[A-Za-z]' \
   > volumes
 
 cat volumes | \
-  grep -v not-backed-up | \
   xargs -I{} -d\\n -- \
   bash -e -c \
     "F={}.dump$COMPRESS_EXT.aescrypt ;
diff --git a/hcoop-backup-wrapper b/hcoop-backup-wrapper
index 422eba8..42f7205 100755
--- a/hcoop-backup-wrapper
+++ b/hcoop-backup-wrapper
@@ -3,7 +3,7 @@
 exec >& /var/log/backup-to-rsync-wrapper-log
 touch /xyz/zys   # generate an error message
 
-exit 1 # temporary until disk space issues are solved
+#exit 1 # temporary until disk space issues are solved
 
 fs checkvol
 LOG=/var/log/backup-to-rsync-log
diff --git a/hcoop-kprop b/hcoop-kprop
index e06fb51..c87d7b3 100755
--- a/hcoop-kprop
+++ b/hcoop-kprop
@@ -14,6 +14,6 @@ kprop hopper.hcoop.net \
    2>&1 | grep -v 'Database propagation to hopper.hcoop.net: SUCCEEDED'
 
 kprop fritz.hcoop.net \
-   2>&1 | grep -v 'Database propagation to hopper.hcoop.net: SUCCEEDED'
+   2>&1 | grep -v 'Database propagation to fritz.hcoop.net: SUCCEEDED'