X-Git-Url: http://git.hcoop.net/clinton/scripts.git/blobdiff_plain/1311d6b04e5eca6a9f629dc70b7f654035f8e4c6..5ab432e8d4fa42dc8cdcf4127fca412afcbe546f:/destroy-user

diff --git a/destroy-user b/destroy-user
index 23b6175..766aa0e 100755
--- a/destroy-user
+++ b/destroy-user
@@ -46,20 +46,30 @@ 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
-vos remove deleuze.hcoop.net /vicepa user.$USER
-vos remove deleuze.hcoop.net /vicepa mail.$USER
-vos remove deleuze.hcoop.net /vicepa db.$USER
+
+# 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.logs