X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=input%2Fhowto%2Fadd-guest.creole;h=70914f1b6a4cd94284c01059ac95cd3fdcc2e9fa;hb=321a1a7dede545b4523bf022b924e9b8da0055c5;hp=a569844e1bea86629c3d1d6dea1ca2fc9776dfbd;hpb=83e272296d6de9197df35a610e997082bebb040b;p=mirror%2Fdsa-wiki.git

diff --git a/input/howto/add-guest.creole b/input/howto/add-guest.creole
index a569844..70914f1 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,14 +22,13 @@ 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:
-
+Once that is done, login to db (aka draghi) and add the account:
 {{{
 	ud-useradd -g
 }}}
@@ -31,3 +36,4 @@ Once that is done, to to db-master (aka draghi) and add the account:
 * note the -g, this is for guest accounts (doesn't prompt for -private etc.)
 * enter fingerprint, account name, [fml] name and forwarding address.
 * enter expiry date and hosts to allow access to, per the request.
+  Two months is typical.