From 06d1e8b48b3eaacacd8491879560a6a11ccb811d Mon Sep 17 00:00:00 2001
From: Michael Spang <mspang@csclub.uwaterloo.ca>
Date: Sun, 16 Dec 2007 18:11:16 -0500
Subject: [PATCH 1/2] Remove ceoquery

Just use the GUI's search feature or ldapsearch directly.
---
 bin/ceoquery | 57 ----------------------------------------------------
 setup.py     |  2 +-
 2 files changed, 1 insertion(+), 58 deletions(-)
 delete mode 100755 bin/ceoquery

diff --git a/bin/ceoquery b/bin/ceoquery
deleted file mode 100755
index 9e35964..0000000
--- a/bin/ceoquery
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/python
-"""
-ceoquery - a script to lookup member and account information
-"""
-import os, sys
-from ceo import members, terms
-
-try:
-    members.connect()
-except Exception, e:
-    print "ceoquery: %s" % e
-    sys.exit(1)
-
-def usage():
-    print "Usage: ceoquery memberlist|termusers"
-
-if len(sys.argv) < 2:
-    usage()
-
-elif sys.argv[1] == 'memberlist':
-    
-    current_term = terms.current()
-    members = members.list_term(current_term)
-    for member in members.values():
-        if 'program' in member:
-            program = member['program'][0]
-        else:
-            program = ''
-        print "%s|%s|%s" % (member['cn'][0], program, member['uid'][0])
-
-elif sys.argv[1] == 'allmembers':
-
-    pass
-
-elif sys.argv[1] == 'booklist':
-
-    pass
-
-elif sys.argv[1] == 'allusers':
-
-    pass
-
-elif sys.argv[1] == 'termusers':
-
-    if len(sys.argv) > 2:
-        term = sys.argv[2]
-    else:
-        term = terms.current()
-
-    members = members.list_term(term)
-    for member in members:
-        print member
-
-else:
-
-    usage()
-
diff --git a/setup.py b/setup.py
index 56cb27a..d5603aa 100755
--- a/setup.py
+++ b/setup.py
@@ -6,6 +6,6 @@ setup(
     name='ceo',
     description='CSC Electronic Office',
     packages=[ 'ceo', 'ceo.urwid' ],
-    scripts=['bin/ceo', 'bin/ceoquery' ],
+    scripts=['bin/ceo'],
 )
 

From 14069b2c08e162374070787493bde1e4d435b7ed Mon Sep 17 00:00:00 2001
From: Michael Spang <mspang@csclub.uwaterloo.ca>
Date: Sun, 16 Dec 2007 18:26:18 -0500
Subject: [PATCH 2/2] Add manpages and remove TODO

---
 debian/manpages  |  1 +
 docs/TODO        |  7 -------
 docs/addclub.1   | 13 +++++++++++++
 docs/addmember.1 | 16 ++++++++++++++++
 docs/ceo.1       | 17 +++++++++++++++++
 5 files changed, 47 insertions(+), 7 deletions(-)
 create mode 100644 debian/manpages
 delete mode 100644 docs/TODO
 create mode 100644 docs/addclub.1
 create mode 100644 docs/addmember.1
 create mode 100644 docs/ceo.1

diff --git a/debian/manpages b/debian/manpages
new file mode 100644
index 0000000..afc0dc3
--- /dev/null
+++ b/debian/manpages
@@ -0,0 +1 @@
+docs/*.[0-9]
diff --git a/docs/TODO b/docs/TODO
deleted file mode 100644
index e146ba5..0000000
--- a/docs/TODO
+++ /dev/null
@@ -1,7 +0,0 @@
-TODO:
-
-* Python bindings for libkadm5
-* Python bindings for quota?
-* Logging via syslog
-* Try to recover and roll-back on error during account creation
-* Write manpages
diff --git a/docs/addclub.1 b/docs/addclub.1
new file mode 100644
index 0000000..0e51829
--- /dev/null
+++ b/docs/addclub.1
@@ -0,0 +1,13 @@
+.TH ADDCLUB 1 "December 16, 2007"
+.SH NAME
+addclub \- add club accounts to the directory
+.SH SYNOPSIS
+.B addclub
+userid clubname
+.SH DESCRIPTION
+.B Addclub
+creates an LDAP entry and home directory for new club accounts.
+.SH SEE ALSO
+.BR ceo (1).
+.SH AUTHOR
+Michael Spang <mspang@csclub.uwaterloo.ca>
diff --git a/docs/addmember.1 b/docs/addmember.1
new file mode 100644
index 0000000..2765aa4
--- /dev/null
+++ b/docs/addmember.1
@@ -0,0 +1,16 @@
+.TH ADDMEMBER 1 "December 16, 2007"
+.SH NAME
+addmember \- add club members to the directory
+.SH SYNOPSIS
+.B addmember
+userid name [ program ]
+.SH DESCRIPTION
+.B Addmember
+performs all tasks necessary for creation of a new CSC member. It creates
+an LDAP entry, Kerberos principal, and home directory for the new member.
+It does NOT register the new member for any terms. This must be done after
+the member is created.
+.SH SEE ALSO
+.BR ceo (1).
+.SH AUTHOR
+Michael Spang <mspang@csclub.uwaterloo.ca>
diff --git a/docs/ceo.1 b/docs/ceo.1
new file mode 100644
index 0000000..ebbe59d
--- /dev/null
+++ b/docs/ceo.1
@@ -0,0 +1,17 @@
+.TH CEO 1 "December 16, 2007"
+.SH NAME
+ceo \- CSC Electronic Office
+.SH DESCRIPTION
+CSC Electronic Office is used to manage membership registration and
+user accounts for the Computer Science Club. It has a graphical
+user interface, started by typing
+.B ceo
+with no arguments.
+.PP
+.SH SEE ALSO
+.BR addmember (1),
+.BR addclub (1).
+.SH AUTHORS
+Michael Spang <mspang@csclub.uwaterloo.ca>
+.br
+David Bartley <dtbartle@csclub.uwaterloo.ca>