minor clean up; add how to lock account

diff --git a/input/howto/add-account.creole b/input/howto/add-account.creole
index 8b3ad78..097b218 100644 (file)
--- a/input/howto/add-account.creole
+++ b/input/howto/add-account.creole
@@ -1,4 +1,4 @@
-== add an account to ud-ldap ==
+== how to add an account to ud-ldap ==
 
 === Introduction ===
 
@@ -11,7 +11,7 @@ so that Debian's Keyring may be updated with the user's GPG key.
 Subsequently, the RT ticket will be assigned to a Debian System Administrator
 (DSA) so that Debian's LDAP may be updated.
 
-This HOWTO documents DSA's actions relating to account creation.
+This HOWTO documents DSA's actions relating to such tickets.
 
 The RT ticket will contain the following details in a GPG-signed message:
 * the user's account type ("uploading DD")

diff --git a/input/howto/lock-account.creole b/input/howto/lock-account.creole
new file mode 100644 (file)
index 0000000..3556440
--- /dev/null
+++ b/input/howto/lock-account.creole
@@ -0,0 +1,28 @@
+== how to lock an account in ud-ldap ==
+
+=== Introduction ===
+
+Per Section 3 of the [[http://www.debian.org/doc/manuals/developers-reference/|Debian Developer's Reference]]
+relating to [[http://www.debian.org/doc/manuals/developers-reference/developer-duties.html|Debian Developer's Duties]],
+a user is required to submit an RT ticket when retiring from Debian.
+
+Initially, the RT ticket will be assigned to a Debian Keyring Maintainer (DKM).
+The DKM will remove the user's GPG key from Debian's Keyring.
+
+Subsequently, the RT ticket will be assigned to a Debian System Administrator
+(DSA) so that Debian's LDAP may be updated.
+
+This HOWTO documents DSA's actions relating to such tickets.
+
+=== Procedure ===
+
+Step 1: On the LDAP master (draghi.debian.org), execute ud-lock, specifying
+the RT ticket number and the username.
+
+{{{
+       you@home~$ ssh you@draghi.debian.org
+       you@draghi~$ ud-lock -r <rt#> <username>
+}}}
+
+Step 2: Resolve the RT ticket.
+

diff --git a/input/index.mdwn b/input/index.mdwn
index 9787550..8e8c31d 100644 (file)
--- a/input/index.mdwn
+++ b/input/index.mdwn
@@ -1,8 +1,8 @@
 # Debian System Administrators
 
-The Debian System Debian Administration Team (DSA) is the team that
-keeps debian.org's infrastructure going. This is the internal team wiki,
-which as some howto mainly targeted for the team members.  
+The Debian System Debian Administrator team (DSA) is responsible for
+Debian's infrastructure.  This wiki is focussed on system administration
+documention, primarily in the form of HOWTOs, for the team.
 
 To contact us, mail debian-admin@lists.debian.org.
 
@@ -20,21 +20,23 @@ prepare patches for any of our GIT repositories please use git format-patch and
 mail them to debian-admin@lists.debian.org or attach them to the according RT
 ticket.
 
-## documentation
+## documentation for end users or services owners
 
-* [[doc/wiki]]: How to contribute to the dsa.d.o wiki
-* [RT Usage](http://wiki.debian.org/Teams/DSA/RTUsage) - offsite
-* [DSA usertagged bugreports](http://bugs.debian.org/cgi-bin/pkgreport.cgi?users=debian-admin@lists.debian.org) - offsite
-* [[user/sudo]]: How to set sudo passwords.
-* [[doc/schroot]]: How schroot can be used on porter machines
-* [[doc/guest-account]]: guest account access to porter machines
-* [[doc/subdomains]]: facilities offered to teams with a dedicated subdomain
+* [how to use RT](http://wiki.debian.org/Teams/DSA/RTUsage)
+* [how to set sudo passwords](user/sudo)
+* [how to request guest access to porter machines](doc/guest-account)
+* [how to use schroot on porter machines](doc/schroot)
+* [how to manage service subdomains](doc/subdomains)
 
-## Internal documentation
+## documentation for 
+* [how to contribute to this wiki](doc/wiki)
+* [list of DSA usertagged bugreports](http://bugs.debian.org/cgi-bin/pkgreport.cgi?users=debian-admin@lists.debian.org)
+
+## documentation for team members
 
 * [[howto/dns]]
-* [[howto/new-machine]]: How to setup and integrate machines into debian.org's infrastructure.
-* [[howto/decomission]]: How to decomission a machine
+* [[howto/new-machine]]: how to add a machine
+* [[howto/decomission]]: how to decomission a machine
 * [[howto/puppet-setup]]
 * [[howto/upgrade-to-lenny]]
 * [[howto/upgrade-to-squeeze]]
@@ -43,16 +45,16 @@ ticket.
 * [[howto/ilo-https]]
 * [[howto/backup]]
 * [[howto/exim-ca]]
-* [[howto/iscsi]]: How to setup a new iscsi initiator
-* [[howto/export-iscsi]]: How to export new iscsi LUNs
-* [[howto/install-kvm]]: How to setup a new kvm domain without going through d-i etc.
+* [[howto/iscsi]]: how to setup a new iscsi initiator
+* [[howto/export-iscsi]]: how to export new iscsi LUNs
+* [[howto/install-kvm]]: how to setup a new kvm domain without going through d-i etc.
 * [[howto/postgres]]: Random postgres stuff
-* [[howto/add-guest]]: How to add guests to ud-ldap
-* [[howto/add-account]]: How to add accounts to ud-ldap / upgrade guest accounts
-* [[howto/swarm-kernel]]: How to build kernels for our swarm boxes
-* [[howto/drac-reset]]: How to beat the radacm rootk^Wbinary only software.
+* [[howto/add-guest]]: how to add a guest to ud-ldap
+* [[howto/add-account]]: how to add an account to ud-ldap (also: how to upgrade a guest)
+* [[howto/lock-account]]: how to lock an account in ud-ldap
+* [[howto/swarm-kernel]]: how to build kernels for our swarm boxes
+* [[howto/drac-reset]]: how to beat the radacm rootk^Wbinary only software.
 * [[howto/new-dpl]]: What to do when we have a new DPL
-* [New DSA manual](http://dsa.debian.org/dsa-manual/_build/html/)
 
 ## ports