# public_html
mkdir -p $HOMEPATH/public_html
chown $USER:nogroup $HOMEPATH/public_html
-fs sa $HOMEPATH/public_html system:anyuser rl
+# Support privatization of home dirs
+#fs sa $HOMEPATH/public_html system:anyuser rl
+fs sa $HOMEPATH/public_html $USER.daemon rl
# .procmail.d
mkdir -p $HOMEPATH/.procmail.d
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.logs
for (@domains) {
push @{ $$store{$u}{domains} }, $_;
- if (!DRY) {
- system("domtool-admin rmdom $_")
- } else {
- warn qq|system("domtool-admin rmdom $_")\n|
- }
+
+ # As per adamc's suggestion, I should not be
+ # running rmdom explicitly.
+ # https://bugzilla.hcoop.net/show_bug.cgi?id=555
+ #if (!DRY) {
+ # system("domtool-admin rmdom $_")
+ #} else {
+ # warn qq|system("domtool-admin rmdom $_")\n|
+ #}
}
if (!DRY) {