fix add-guest command

[mirror/dsa-wiki.git] / input / howto / add-guest.creole

diff --git a/input/howto/add-guest.creole b/input/howto/add-guest.creole
index 24d4731..35ccb83 100644 (file)
--- a/input/howto/add-guest.creole
+++ b/input/howto/add-guest.creole
@@ -2,22 +2,29 @@
 
 === add to guest keyring ===
 
-at home:
+first, import the guest key into your keyring:
+{{{
+       echo -n "New user's key fingerprint: " &&
+       read fingerprint &&
+       ./add-key "`echo $fingerprint | tr -d ' '`" &&
+}}}
 
+then, add the guest's public gpg key into the guest keyring by
 {{{
-cd projects/debian/d-a/guest-keyring
+       cd ~/dsa/guest-keyring
 }}}
 
-or whereever you keep the checkout.  Then
+or whereever you keep the checkout and executing:
 {{{
-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 commit -a &&
+       git push
 }}}
 
 === add to ldap ===
@@ -25,19 +32,10 @@ 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.
+  Two months is typical.