X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=input%2Fhowto%2Fadd-guest.creole;h=464768e3bf2b56444d35f340adde7cbf1c2f8e12;hb=eba3cc46986eda2324decd06afed3f78e9ec7864;hp=35ccb83d9e650203ce63df06e1e70723f090d961;hpb=ff444ff6a62af8688d8f4ba6aedc26813cb095ca;p=mirror%2Fdsa-wiki.git

diff --git a/input/howto/add-guest.creole b/input/howto/add-guest.creole
index 35ccb83..464768e 100644
--- a/input/howto/add-guest.creole
+++ b/input/howto/add-guest.creole
@@ -1,41 +1,39 @@
 == Add a guest account to ud-ldap ==
 
-=== add to guest keyring ===
+Check that the new user is a Debian contributor and the request is reasonable.
+
+Save the signed request to a file and the signed DMUP agreement to another file.
+
+Setup the script that automates the addition of guest accounts:
 
-first, import the guest key into your keyring:
 {{{
-	echo -n "New user's key fingerprint: " &&
-	read fingerprint &&
-	./add-key "`echo $fingerprint | tr -d ' '`" &&
+	git clone https://db.debian.org/git/dsa-misc.git
+	ln -s $(pwd)/scripts/add-guest ~/bin/dsa-add-guest
 }}}
 
-then, add the guest's public gpg key into the guest keyring by
+For a guest account based on DM or NM status:
+
 {{{
-	cd ~/dsa/guest-keyring
+	dsa-add-guest ~/dsa/debian-keyrings ~/dsa/guest-keyring ~/path/to/mail ~/path/to/dmup dm <fingerprint>
+	dsa-add-guest ~/dsa/debian-keyrings ~/dsa/guest-keyring ~/path/to/mail ~/path/to/dmup nm <fingerprint>
 }}}
 
-or whereever you keep the checkout and executing:
-{{{
+For a guest account based on a sponsor:
 
-	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
+{{{        
+	dsa-add-guest ~/dsa/debian-keyrings ~/dsa/guest-keyring ~/path/to/mail ~/path/to/dmup sponsor <fingerprint>
 }}}
 
-=== add to ldap ===
-
-Once that is done, to to db-master (aka draghi) and add the account:
+At the git commit prompt enter something like this:
 
 {{{
-	ud-useradd -g
+	Add Jane Doe (RT#1234)
 }}}
 
-* note the -g, this is for guest accounts (doesn't prompt for -private etc.)
+At the final account entry prompt:
+
 * 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.
+
+Then close the RT ticket.