X-Git-Url: http://git.hcoop.net/clinton/scripts.git/blobdiff_plain/2639c68fc88f5804503ed6556a88e25acf040c25..82cda9f8fe4595f243af80a3acef7ea7e8d939a4:/destroy-user?ds=sidebyside

diff --git a/destroy-user b/destroy-user
index 323487f..10a7fb1 100755
--- a/destroy-user
+++ b/destroy-user
@@ -14,7 +14,6 @@ fi
 PATHBITS=`echo $USER | head -c 1`/`echo $USER | head -c 2`/$USER
 HOMEPATH=/afs/hcoop.net/user/$PATHBITS
 MAILPATH=/afs/hcoop.net/common/email/$PATHBITS
-DBPATH=/afs/.hcoop.net/common/.databases/$PATHBITS
 # We don't use separate partitions for logs
 #LOGSPATH=/afs/.hcoop.net/common/.logs/$USER
 
@@ -46,22 +45,32 @@ sudo nscd -i passwd
 sudo nscd -i group
 
 # Remove from databases
-sudo -u postgres psql -c "DROP TABLESPACE user_$USER"
+#sudo -u postgres psql -c "DROP TABLESPACE user_$USER"
 #sudo -u postgres psql -c "DROP USER $USER"
 #sudo -H mysql -e "DROP USER $USER@localhost"
 
+# Remove privs before rm
+fs sa $HOMEPATH -clear system:anyuser none
+fs sa $MAILPATH -clear system:anyuser none
+#XXX see what to do with db volume
+
 fs rm $MAILPATH
 fs rm $HOMEPATH
 #fs rm $LOGSPATH
-fs rm $DBPATH
+#fs rm $DBPATH
 fs rm /afs/.hcoop.net/old/user/$PATHBITS
 fs rm /afs/.hcoop.net/old/mail/$PATHBITS
+
+# Don't delete volumes, rename them.
 #vos remove deleuze.hcoop.net /vicepa user.$USER
 #vos remove deleuze.hcoop.net /vicepa mail.$USER
 #vos remove deleuze.hcoop.net /vicepa db.$USER
 #vos remove deleuze.hcoop.net /vicepa logs.$USER
+vos rename user.$USER user.$USER.d
+vos rename mail.$USER mail.$USER.d
+#XXX vos rename db.$USER db.$USER.d
 
-vos release common.databases
+#vos release common.databases
 #vos release common.logs
 
 sudo kadmin.local -q "delprinc -force $USER@HCOOP.NET"