X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=input%2Fhowto%2Fadd-guest.creole;h=cfc2c6b0e197511349007ec3a9cd46443e7b1683;hb=7ba134fb155e7b0b2ca3ab6950f046462c03a9f8;hp=9783a7f40a36b2794734ebae406492a93a4bb98e;hpb=fc124ff8d7a558192f10a7d14b0def4e599deebf;p=mirror%2Fdsa-wiki.git

diff --git a/input/howto/add-guest.creole b/input/howto/add-guest.creole
index 9783a7f..cfc2c6b 100644
--- a/input/howto/add-guest.creole
+++ b/input/howto/add-guest.creole
@@ -2,13 +2,19 @@
 
 === add to guest keyring ===
 
-at home:
+Import the guest key into your keyring.
+{{{
+	echo -n "New user's key fingerprint: " &&
+	read fingerprint &&
+	gpg --recv-keys "`echo $fingerprint | tr -d ' ' | cut -b 25-`"
+}}}
 
+Change to the directory where you keep the guest-keyring repository:
 {{{
-	cd projects/debian/d-a/guest-keyring
+	cd ~/dsa/guest-keyring
 }}}
 
-or whereever you keep the checkout.  Then
+Export from your keyring into the guest-keyring using:
 {{{
 	git pull &&
 	echo -n "New user's key fingerprint: " &&
@@ -16,28 +22,18 @@ or whereever you keep the checkout.  Then
 	./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 commit -a &&
 	git push
 }}}
 
 === add to ldap ===
 
 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.