major overhaul of rhesus:

- much more sophisticated validity checking of keys/uids
- broke out more functions
- cleaned-up/simplified code
- changed to new variable naming standard

3 files changed, 47 insertions, 132 deletions

diff --git a/doc/MonkeySpec b/doc/MonkeySpec
index 7a19df0..c36e7de 100644
--- a/doc/MonkeySpec
+++ b/doc/MonkeySpec
@@ -102,4 +102,4 @@ Write manpage for gpgkey2ssh
 gpg private key (start with passwordless) to PEM encoded private key: perl libraries, libopencdk / gnutls, gpgme 
 setup remote git repo
 think through / plan merging of known_hosts (& auth_keys?)
-think about policies and their representation
\ No newline at end of file
+think about policies and their representation
diff --git a/doc/README b/doc/README
index 4c70d1d..9dc8753 100644
--- a/doc/README
+++ b/doc/README
@@ -1,5 +1,48 @@
-				Monkeysphere
-				------------
+Monkeysphere README
+-------------------
 
+Default file locations:
 
-This is the README!
+MS_HOME=~/.config/monkeysphere
+STAGING_AREA=$MS_HOME
+GNUPGHOME=~/.gnupg
+$MS_HOME/monkeysphere.conf
+$MS_HOME/auth_host_ids
+$MS_HOME/auth_user_ids
+$STAGING_AREA/host_keys/KEYHASH
+$STAGING_AREA/known_hosts
+$STAGING_AREA/user_keys/KEYHASH
+$STAGING_AREA/authorized_keys
+
+For a user to update their ms known_hosts file:
+
+$ rhesus --known_hosts
+
+For a user to update their ms authorized_keys file:
+
+$ rhesus --authorized_keys
+
+A system can maintain ms authorized_keys files for it's users.  Some
+different variables need to be defined to help manage this.  The way
+this is done is by first defining a new MS_HOME:
+
+MS_HOME=/etc/monkeysphere
+
+This directory would then have a monkeysphere.conf which defines the
+following variables:
+
+AUTH_USER_FILE="$MS_HOME"/auth_user_ids/"$USER"
+STAGING_AREA=/var/lib/monkeysphere/stage/$USER
+GNUPGHOME=$MS_HOME/gnupg
+
+To update the ms authorized_keys file for user "foo", the system would
+then run the following:
+
+# USER=foo MS_HOME=/etc/monkeysphere rhesus --authorized_keys
+
+To update the ms authorized_keys file for all users on the the system:
+
+MS_HOME=/etc/monkeysphere
+for USER in $(ls -1 /etc/monkeysphere/auth_user_ids) ; do
+    rhesus --authorized_keys
+done
diff --git a/doc/git init b/doc/git init
deleted file mode 100644
index 7ba5071..0000000
--- a/doc/git init
+++ /dev/null
@@ -1,128 +0,0 @@
-remote$ mkdir public_html/git
-(etch)
-remote$ GIT_DIR=~/public_html/git/monkeysphere.git git init-db
-remote$ cd ~/public_html/git/monkeysphere.git
-remote$ chmod a+x hooks/post-update
-# NOT SURE IF THIS IS NEEDED: remote$ git-update-server-info
-fetch = +refs/heads/*:refs/remotes/dkg/*
-
-(newer)
-remote$ mkdir -p public_html/git/monkey.git
-remote$ cd public_html/git/monkey.git
-remote$ git --bare init
-remote$ chmod a+x hooks/post-update
-remote$ git-update-server-info
-
-(new way! no origin/)
-$ cd ~/src
-$ mkdir monkeysphere
-$ cd monkeysphere
-$ git init
-$ git remote add -f mlcastle http://git.mlcastle.net/monkeysphere.git/
-$ git remote add grunt grunt:/whatever
-$ git config remote.grunt.push "+refs/heads/*"
-$ git merge mlcastle/master
-$ git push grunt
-
-(old way!)
-(in ~/src or wherever)
-local$ git clone http://git.mlcastle.net/monkeysphere.git/ monkeysphere
-local$ cd monkeysphere
-
-.git/config:
-
-[core]
-	repositoryformatversion = 0
-	filemode = true
-	bare = false
-	logallrefupdates = true
-
-## THIS ONE NEEDS TO BE CHANGED TO YOUR REMOTE URI
-[remote "post"]
-	url = YOUR-REMOTE-URL/git/monkeysphere.git
-	push = +refs/heads/*
-### THE ABOVE ONE NEEDS TO BE CHANGED
-
-[remote "mlcastle"]
-	url = http://git.mlcastle.net/monkeysphere.git/
-	fetch = +refs/heads/*:refs/remotes/mlcastle/*
-
-[remote "jrollins"]
-	url = http://lair.fifthhorseman.net/~jrollins/git/monkeysphere.git/
-	fetch = +refs/heads/*:refs/remotes/jrollins/*
-
-[remote "dkg"]
-	url = http://lair.fifthhorseman.net/~dkg/git/monkeysphere.git/
-	fetch = +refs/heads/*:refs/remotes/dkg/*
-
-[remote "mjgoins"] SEE: dkg, jrollins, etc.
-
-[remote "micah"]
-	url = http://micah.riseup.net/git/monkeysphere.git
-	fetch = +refs/heads/*:refs/remotes/micah/*
-	
-[remote "enw"]
-	url = http://lair.fifthhorseman.net/~enw/git/monkeysphere.git/
-	fetch = +refs/heads/*:refs/remotes/enw/*
-
-[remote "rossg"]
-	url = http://lair.fifthhorseman.net/~rossg/git/monkeysphere.git/
-	fetch = +refs/heads/*:refs/remotes/rossg/*
-
-[remote "greg"]
-	url = http://lair.fifthhorseman.net/~greg/git/monkeysphere.git/
-	fetch = +refs/heads/*:refs/remotes/greg/*
-        blood type = 
-
------------------
-[remote "upload"]
-	url = ssh://z.mlcastle.net/var/www/git/monkeysphere.git/
-	push = +refs/heads/*
-
-
-$ git fetch dkg
-$ git checkout master
-$ git merge remotes/dkg/master
-$ git push post
-
-
-
-
-
-
-
-grunt's fingerprint: be:43:9c:03:9c:04:1a:97:7a:61:8a:fe:71:9d:6c:67
-(grunt is lair.fifthhorseman.net)
-
-for foo in $(git remote); do git fetch $foo; done
-
-
-
-set mainfont {Arial 12}
-set textfont { Courier 12}
-set uifont {Arial 10 bold}
-set tabstop 8
-set findmergefiles 0
-set maxgraphpct 50
-set maxwidth 16
-set cmitmode patch
-set wrapcomment none
-set showneartags 1
-set showlocalchanges 1
-set datetimeformat {%Y-%m-%d %H:%M:%S}
-set limitdiffs 1
-set bgcolor white
-set fgcolor black
-set colors {green red blue magenta darkgrey brown orange}
-set diffcolors {red "#00a000" blue}
-set diffcontext 3
-set selectbgcolor gray85
-set geometry(main) 1280x936+14+28
-set geometry(topwidth) 1278
-set geometry(topheight) 286
-set geometry(pwsash0) "638 1"
-set geometry(pwsash1) "903 1"
-set geometry(botwidth) 1001
-set geometry(botheight) 638
-set permviews {}
-