exit 1
fi
+#
+# Helper functions
+#
+
+# Run a command on both mire and deleuze; assumes that no escaping is
+# needed.
+function mire_and_deleuze() {
+ $*
+ ssh mire.hcoop.net $*
+}
#
# Kerberos principals
vos examine user.$USER 2>/dev/null || \
vos create deleuze.hcoop.net /vicepa user.$USER -maxquota 400000
mkdir -p `dirname $HOMEPATH`
-fs ls $HOMEPATH || fs mkm $HOMEPATH user.$USER
-chown $USER $HOMEPATH
+fs ls $HOMEPATH || test -L $HOMEPATH || fs mkm $HOMEPATH user.$USER
+chown $USER:nogroup $HOMEPATH
fs sa $HOMEPATH $USER all
fs sa $HOMEPATH system:anyuser l
# Apache logs
mkdir -p $HOMEPATH/logs/apache
-fsr sa $HOMEPATH/logs/apache $USER.daemon rlwidk
+chown $USER:nogroup $HOMEPATH/logs/apache
+fs sa $HOMEPATH/logs/apache $USER.daemon rlwidk
# public_html
-mkdir -p $HOMEPATH/public_html/
+mkdir -p $HOMEPATH/public_html
+chown $USER:nogroup $HOMEPATH/public_html
fs sa $HOMEPATH/public_html system:anyuser rl
-mkdir -p $HOMEPATH/.procmail.d/
-fs sa $HOMEPATH/.procmail.d/ system:anyuser rl
+
+# .procmail.d
+mkdir -p $HOMEPATH/.procmail.d
+chown $USER:nogroup $HOMEPATH/.procmail.d
+fs sa $HOMEPATH/.procmail.d system:anyuser rl
+
+# .public
mkdir -p $HOMEPATH/.public/
-fs sa $HOMEPATH/.public/ system:anyuser rl
-test -e $HOMEPATH/.forward || \
- test -L $HOMEPATH/.forward || \
- ln -s $HOMEPATH/.public/.forward $HOMEPATH/.forward
-mkdir -p $HOMEPATH/.public/.domtool/
+chown $USER:nogroup $HOMEPATH/.public
+fs sa $HOMEPATH/.public system:anyuser rl
+
+# .domtool
+mkdir -p $HOMEPATH/.public/.domtool
+chown $USER:nogroup $HOMEPATH/.public/.domtool
test -e $HOMEPATH/.domtool || \
test -L $HOMEPATH/.domtool || \
ln -s $HOMEPATH/.public/.domtool $HOMEPATH/.domtool
mkdir -p `dirname $MAILPATH`
fs ls $MAILPATH || fs mkm $MAILPATH mail.$USER
fs ls $HOMEPATH/Maildir || fs mkm $HOMEPATH/Maildir mail.$USER
+chown $USER:nogroup $MAILPATH
+chown $USER:nogroup $HOMEPATH/Maildir
fs sa $MAILPATH $USER all
-fsr sa $MAILPATH $USER.daemon all
+fs sa $MAILPATH $USER.daemon all
+
+# Set up shared SpamAssassin folder
+if test -f $HOMEPATH/Maildir/shared-maildirs; then
+ # Deal with case where user rsync'd their Maildir from fyodor
+ pattern='^SpamAssassin /home/spamd'
+ file=$HOMEPATH/Maildir/shared-maildirs
+ if grep $pattern $file; then
+ sed -i -r -e \
+ 's!^(SpamAssassin )/home/spamd!\1/var/local/lib/spamd!1' \
+ $file
+ fi
+ for dir in $HOMEPATH/Maildir/shared-folders/SpamAssassin/*; do
+ dest=/var/local/lib/spamd/Maildir/.$(basename $dir)
+ if test "$(readlink $dir/shared)" != "$dest"; then
+ ln -sf $dest $dir/shared
+ fi
+ done
+else
+ maildirmake --add SpamAssassin=/var/local/lib/spamd/Maildir \
+ $HOMEPATH/Maildir
+fi
# DATABASE VOLUME
if ! vos examine db.$USER >/dev/null 2>/dev/null; then
vos syncvldb deleuze
# refresh volume location cache (takes ~2hrs otherwise)
-fs checkvolumes
-ssh mire.hcoop.net fs checkvolumes
-
-# Technically this is not idempotent. This is not *too* bad because
-# of the fact that in AFS non-system:administrators users can't change
-# the group/owner of a file anyways. However, users still might want
-# to know which other users created certain files (in, say, a dropbox
-# or something like that). FIMXE.
-chown -R $USER:nogroup $HOMEPATH
-chown -R $USER:nogroup $MAILPATH
+mire_and_deleuze fs checkvolumes
+
+#
+# Non-AFS files and directories
+#
+
+# Make per-user apache DAV lock directory -- the directory must be
+# both user and group-writable, which is silly.
+mire_and_deleuze sudo mkdir -p /var/lock/apache2/dav/$USER
+mire_and_deleuze sudo chown $USER:www-data /var/lock/apache2/dav/$USER
+mire_and_deleuze sudo chmod ug=rwx,o= /var/lock/apache2/dav/$USER