From: mwolson_admin <mwolson_admin@deleuze.hcoop.net>
Date: Mon, 22 Oct 2007 14:34:43 +0000 (-0400)
Subject: Merge from CVS: create-user: use pagsh in commented-out example
X-Git-Url: https://git.hcoop.net/clinton/scripts.git/commitdiff_plain/0d773e41ce96913a2362a007aa855e2fa30d3616?hp=-c

Merge from CVS: create-user: use pagsh in commented-out example
---

0d773e41ce96913a2362a007aa855e2fa30d3616
diff --combined create-user
index 0e999ce,d374f35..c6feb4c
--- a/create-user
+++ b/create-user
@@@ -9,6 -9,21 +9,21 @@@
  #  - while holding tokens for a user who is:
  #     - a member of system:administrator
  #     - listed in 'bos listusers deleuze'
+ #  - and who has been set up with Domtool admin privileges by:
+ #     - running 'domtool-adduser $USER' while holding AFS admin tokens as
+ #       someone who is already a Domtool admin
+ #     - running 'domtool-admin grant $USER priv all' as someone who is already a
+ #       Domtool admin
+ #       (To bootstrap yourself into admindom:
+ #         1. Run '/etc/init.d/domtool-server stop' on deleuze.
+ #         2. Run '/etc/init.d/domtool-slave stop' on all Domtool slave machines
+ #            (e.g., mire).
+ #         3. Edit ~domtool/acl, following the example of adamc_admin to grant
+ #             yourself 'priv all'.
+ #         4. Run '/etc/init.d/domtool-server start' on deleuze.
+ #         5. Run '/etc/init.d/domtool-slave start' on all Domtool slave
+ #            machines.
+ #         6. Run 'domtool-adduser' as above.)
  
  USER=$1
  
@@@ -206,23 -221,23 +221,23 @@@ if test -f $HOMEPATH/Maildir/shared-mai
  # This does not yet seem to be needed, and it triggers an AFS issue,
  # so I've commented it out --mwolson.
  #
 -NOTIFY=no
 -for dir in $HOMEPATH/Maildir/shared-folders/SpamAssassin/*; do
 -    if ! test -d $dir; then
 -        NOTIFY=yes
 -    else
 -        dest=/var/local/lib/spamd/Maildir/.$(basename $dir)
 -        if test "$(readlink $dir/shared)" != "$dest"; then
 -            ln -sf $dest $dir/shared
 -        fi
 -    fi
 -done
 -if test $NOTIFY = yes; then
 -    # This is probably going overboard, but oh well
 -    echo "$USER needs assistance on their shared spam dir" | \
 -        pagsh -c mail -s "[create-user] $USER needs assistance" \
 -          -e -a "From: admins@deleuze.hcoop.net" mwolson_admin
 -fi
 +#     NOTIFY=no
 +#     for dir in $HOMEPATH/Maildir/shared-folders/SpamAssassin/*; do
 +#         if ! test -d $dir; then
 +#             NOTIFY=yes
 +#         else
 +#             dest=/var/local/lib/spamd/Maildir/.$(basename $dir)
 +#             if test "$(readlink $dir/shared)" != "$dest"; then
 +#                 ln -sf $dest $dir/shared
 +#             fi
 +#         fi
 +#     done
 +#     if test $NOTIFY = yes; then
 +#         # This is probably going overboard, but oh well
 +#         echo "$USER needs assistance on their shared spam dir" | \
- #             mail -s "[create-user] $USER needs assistance" \
++#             pagsh -c mail -s "[create-user] $USER needs assistance" \
 +#               -e -a "From: admins@deleuze.hcoop.net" mwolson_admin
 +#     fi
  
  else
      maildirmake --add SpamAssassin=/var/local/lib/spamd/Maildir \