X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=input%2Fhowto%2Fadd-guest.creole;h=a569844e1bea86629c3d1d6dea1ca2fc9776dfbd;hb=d004bf4d70cd23b08b4cc064137826df2c743b63;hp=24d4731798bbd652be033bfc8cfd92bc6ac231d1;hpb=68fb1ec39c4b640193c111a932ad79396e01f49c;p=mirror%2Fdsa-wiki.git

diff --git a/input/howto/add-guest.creole b/input/howto/add-guest.creole
index 24d4731..a569844 100644
--- a/input/howto/add-guest.creole
+++ b/input/howto/add-guest.creole
@@ -5,19 +5,19 @@
 at home:
 
 {{{
-cd projects/debian/d-a/guest-keyring
+	cd projects/debian/d-a/guest-keyring
 }}}
 
 or whereever you keep the checkout.  Then
 {{{
-git pull &&
-echo -n "New user's key fingerprint: " &&
-read fingerprint &&
-./add-key "`echo $fingerprint | tr -d ' '`" &&
-git add debian-guest/add-"`echo $fingerprint | tr -d ' ' | cut -b 25-`" &&
-git add debian-guest/index debian-guest/index.gpg &&
-git ci &&
-git push
+	git pull &&
+	echo -n "New user's key fingerprint: " &&
+	read fingerprint &&
+	./add-key "`echo $fingerprint | tr -d ' '`" &&
+	git add debian-guest/add-"`echo $fingerprint | tr -d ' ' | cut -b 25-`" &&
+	git add debian-guest/index debian-guest/index.gpg &&
+	git ci &&
+	git push
 }}}
 
 === add to ldap ===
@@ -25,19 +25,9 @@ git push
 Once that is done, to to db-master (aka draghi) and add the account:
 
 {{{
-ud-useradd -n
+	ud-useradd -g
 }}}
 
+* note the -g, this is for guest accounts (doesn't prompt for -private etc.)
 * enter fingerprint, account name, [fml] name and forwarding address.
-* do _not_ subscribe to -private (enter a <space> character)
-* keep uid number
-* use 60000 as gid number
-
-Then set an expire date for the user:
-{{{
-echo -n "userid of new user: " &&
-read uid &&
-ldapvi --encoding=ASCII -ZZ --ldap-conf -h db.debian.org -D uid=$USER,ou=users,dc=debian,dc=org "uid=$uid"
-}}}
-
-and set {{{shadowExpire}}} to today + 60 days (   {{{echo $(( `date +%s` / 3600 / 24 + 60 ))}}}   ).
+* enter expiry date and hosts to allow access to, per the request.