From b7b1cdff58b26cd7bef09bb781e18c2af6176ae3 Mon Sep 17 00:00:00 2001 From: bigmike160 Date: Sun, 7 Oct 2007 16:35:10 +0000 Subject: [PATCH 1/1] create-user: Fix idempotency issue at end of file - Call chown after every mkdir. - Standardize on lack of trailing slash in mkdir and chown calls. - Specify both user and group on every chown call. - Separate and comment some long stanzas. - Remove chown -R and FIXME at end. --- create-user | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/create-user b/create-user index a83c524..b01cbc6 100755 --- a/create-user +++ b/create-user @@ -135,22 +135,33 @@ 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 +chown $USER:nogroup $HOMEPATH fs sa $HOMEPATH $USER all fs sa $HOMEPATH system:anyuser l # Apache logs mkdir -p $HOMEPATH/logs/apache -fs 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 -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 @@ -159,6 +170,7 @@ test -e $HOMEPATH/.domtool || \ vos examine mail.$USER 2>/dev/null || \ vos create deleuze.hcoop.net /vicepa mail.$USER -maxquota 400000 mkdir -p `dirname $MAILPATH` +chown $USER:nogroup $MAILPATH fs ls $MAILPATH || fs mkm $MAILPATH mail.$USER fs ls $HOMEPATH/Maildir || fs mkm $HOMEPATH/Maildir mail.$USER fs sa $MAILPATH $USER all @@ -209,11 +221,3 @@ 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 -- 2.20.1