From 2d599b60e949c65083cd3bb012ff7630b73b31c8 Mon Sep 17 00:00:00 2001
From: Michael Gregson <mgregson@csclub.uwaterloo.ca>
Date: Thu, 15 Jan 2009 19:18:04 -0500
Subject: [PATCH] Debugging

---
 ceo/library.py                           |  2 +-
 etc/{accounts.cf => accounts.cf.example} | 15 +++++++++++----
 etc/{ldap.cf => ldap.cf.example}         |  3 ++-
 3 files changed, 14 insertions(+), 6 deletions(-)
 rename etc/{accounts.cf => accounts.cf.example} (61%)
 rename etc/{ldap.cf => ldap.cf.example} (85%)

diff --git a/ceo/library.py b/ceo/library.py
index f8d3254..7f090af 100644
--- a/ceo/library.py
+++ b/ceo/library.py
@@ -39,7 +39,7 @@ class Book(SQLObject):
         Call this with a username to sign out
         a book.
         """
-        if members.registered(u,terms.currrent()):
+        if members.registered(u, terms.current()):
             s = Signout(username=u, book=self,
                         outdate=datetime.today(), indate=None)
 
diff --git a/etc/accounts.cf b/etc/accounts.cf.example
similarity index 61%
rename from etc/accounts.cf
rename to etc/accounts.cf.example
index 64408c8..a9b9819 100644
--- a/etc/accounts.cf
+++ b/etc/accounts.cf.example
@@ -9,6 +9,9 @@ member_min_id = 20001
 member_max_id = 29999
 member_shell = "/bin/bash"
 member_home = "/users"
+#member_home_acl = "u::rwx,g::rx,o::rx"
+#member_home_dacl =
+member_home_acl =
 
 ### Club Account Options ###
 
@@ -16,6 +19,7 @@ club_min_id = 30001
 club_max_id = 39999
 club_shell = "/bin/bash"
 club_home = "/users"
+club_home_acl = "A+group:%s:rwpRAxaWdDcCs:fd:allow"
 
 ### Administrative Account Options
 
@@ -26,9 +30,9 @@ admin_home = "/users"
 
 ### Home Directory Options ###
 
-skeleton_dir = "/etc/skel"
-homedir_mode = 0755
-quota_prototype = "ctdalek"
+skeleton_dir = "/users/skel"
+homedir_mode = "0755"
+refquota = "4G"
 
 ### Validation Tuning ###
 
@@ -36,4 +40,7 @@ username_regex = "^[a-z][-a-z0-9]*$"
 min_password_length = 4
 shells_file = "/etc/shells"
 privileged_group = "staff"
-notify_hook = "/etc/csc/thingie"
+notify_hook = "/etc/csc/notify-hook"
+expired_account_email = "/etc/csc/expired-account"
+mathsoc_regex = ".*(mat/|vpa/se|computer science|math).*"
+mathsoc_dont_count = "cpdohert dlgawley dtbartle mbiggs saforres tmyklebu"
diff --git a/etc/ldap.cf b/etc/ldap.cf.example
similarity index 85%
rename from etc/ldap.cf
rename to etc/ldap.cf.example
index bc5a73e..29755da 100644
--- a/etc/ldap.cf
+++ b/etc/ldap.cf.example
@@ -4,10 +4,11 @@ server_url = "ldaps:///"
 
 users_base  = "ou=People,dc=csclub,dc=uwaterloo,dc=ca"
 groups_base = "ou=Group,dc=csclub,dc=uwaterloo,dc=ca"
+sudo_base = "ou=SUDOers,dc=csclub,dc=uwaterloo,dc=ca"
 
 admin_bind_dn =
-admin_bind_userid = "ceo"
 admin_bind_keytab = "/etc/csc/ceo.keytab"
+admin_bind_userid = "ceo"
 
 sasl_mech = "GSSAPI"
 sasl_realm = "CSCLUB.UWATERLOO.CA"