From a7ccf57188892a050566025587009d153c39cfef Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Sat, 2 Aug 2008 12:26:26 -0700 Subject: Tried adding website to george. This may be non-ideal config, but it's a start. --- doc/george/changelog | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/george/changelog b/doc/george/changelog index e49a053..873bc0d 100644 --- a/doc/george/changelog +++ b/doc/george/changelog @@ -4,8 +4,19 @@ * * ****************************************************************************** * Please add new entries in reverse chronological order whenever you make * -* changes to this system * +* changes to this system (first command at top, last at bottom) * ****************************************************************************** +2008-08-02 - jrollins + * aptitude update && aptitude dist-upgrade + * restarted cron, nullmailer, sshd + * aptitude install git-core ikiwiki + * adduser webmaster + * as webmaster, cloned jrollins git repo at ~webmaster/monkeysphere + * added post-commit hook to webmaster repo to update monkeysphere + ikiwiki at /srv/www. + * ran the post-commit script to generate pages, which are now + visible. + 2008-06-23 - dkg * added monkeysphere apt repository to /etc/apt/sources.list * added dkg's key to apt's list of trusted keys. @@ -27,7 +38,7 @@ /etc/default/ssh in order to make this error go away: "error writing /proc/self/oom_adj: Operation not permitted" (c.f. Debian #487325) - + 2008-06-20 - dkg * touched /etc/environment to get rid of some spurious auth.log entries. -- cgit v1.2.3 From c7a177b4b3a5b7e1add731bc5b6ed04b6163ccc2 Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Sat, 2 Aug 2008 14:09:03 -0700 Subject: Update what I did on george, and made small change to website to test. --- doc/george/changelog | 14 +++++++++----- website/index.mdwn | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'doc') diff --git a/doc/george/changelog b/doc/george/changelog index 873bc0d..34fe9bb 100644 --- a/doc/george/changelog +++ b/doc/george/changelog @@ -11,11 +11,15 @@ * restarted cron, nullmailer, sshd * aptitude install git-core ikiwiki * adduser webmaster - * as webmaster, cloned jrollins git repo at ~webmaster/monkeysphere - * added post-commit hook to webmaster repo to update monkeysphere - ikiwiki at /srv/www. - * ran the post-commit script to generate pages, which are now - visible. + * su - webmaster + * created a bare repo at ~webmaster/monkeysphere.git. I then + pushed into this repo from my working directory on servo to verify + that it was accepting. + * cloned above repo at ~webmaster/monkeysphere + * created ~webmaster/ikiwiki.setup + * ikiwiki --setup ikiwiki.setup + * changed default keyserver to be pgp.mit.edu (subkeys.pgp.net blows) + 2008-06-23 - dkg * added monkeysphere apt repository to /etc/apt/sources.list diff --git a/website/index.mdwn b/website/index.mdwn index 5c8a694..8038dd3 100644 --- a/website/index.mdwn +++ b/website/index.mdwn @@ -2,7 +2,7 @@ The Monkeysphere project's goal is to extend the web of trust model and other features of OpenPGP to other areas of the Internet to help us securely identify each other while we work online. -Specifically, the Monkeysphere is a framework to leverage the OpenPGP +Specifically, monkeysphere is a framework to leverage the OpenPGP web of trust for OpenSSH authentication. In other words, it allows you to use your OpenPGP keys when using secure shell to both identify yourself and the servers you administer or connect to. OpenPGP keys -- cgit v1.2.3 From 93824de5efefc2810c3c62b27e6e1240440cdd0c Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Sat, 2 Aug 2008 14:12:21 -0700 Subject: Update what I did on george --- doc/george/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/george/changelog b/doc/george/changelog index 34fe9bb..770a265 100644 --- a/doc/george/changelog +++ b/doc/george/changelog @@ -18,6 +18,7 @@ * cloned above repo at ~webmaster/monkeysphere * created ~webmaster/ikiwiki.setup * ikiwiki --setup ikiwiki.setup + * linked post-receive to new post-commit hook in monkeysphere.git * changed default keyserver to be pgp.mit.edu (subkeys.pgp.net blows) -- cgit v1.2.3 From ce1111775aa0e23680932508c2b31e8091ff8beb Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Sat, 2 Aug 2008 16:41:46 -0700 Subject: Fix how file modification check is done, and fix accidental extraneous output. --- debian/changelog | 6 +++++- doc/george/changelog | 7 +++++-- src/common | 14 +++++++++++--- 3 files changed, 21 insertions(+), 6 deletions(-) (limited to 'doc') diff --git a/debian/changelog b/debian/changelog index c81d844..8bfd387 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ monkeysphere (0.7-1) UNRELEASED; urgency=low + [ Daniel Kahn Gillmor ] * Added monkeysphere-server diagnostics subcommand. - -- Daniel Kahn Gillmor Thu, 31 Jul 2008 19:27:45 -0400 + [ Jameson Graef Rollins ] + * fix how check for file modification is done. + + -- Jameson Graef Rollins Sat, 02 Aug 2008 16:41:20 -0700 monkeysphere (0.6-1) experimental; urgency=low diff --git a/doc/george/changelog b/doc/george/changelog index 770a265..45834d6 100644 --- a/doc/george/changelog +++ b/doc/george/changelog @@ -19,8 +19,11 @@ * created ~webmaster/ikiwiki.setup * ikiwiki --setup ikiwiki.setup * linked post-receive to new post-commit hook in monkeysphere.git - * changed default keyserver to be pgp.mit.edu (subkeys.pgp.net blows) - + * changed default keyserver to be pgp.mit.edu (subkeys.pgp.net + blows) + * updated /etc/skel with ssh and monkeysphere stuff + * made authorzied_user_ids file for webmaster and ran + "monkeysphere-server u webmaster". 2008-06-23 - dkg * added monkeysphere apt repository to /etc/apt/sources.list diff --git a/src/common b/src/common index e281de4..ba7df73 100644 --- a/src/common +++ b/src/common @@ -498,6 +498,7 @@ update_known_hosts() { local nHosts local nHostsOK local nHostsBAD + local fileCheck local host # the number of hosts specified on command line @@ -512,6 +513,9 @@ update_known_hosts() { # create a lockfile on known_hosts lockfile-create "$KNOWN_HOSTS" + # note pre update file checksum + fileCheck=$(md5sum "$KNOWN_HOSTS") + for host ; do # process the host process_host_known_hosts "$host" @@ -533,7 +537,7 @@ update_known_hosts() { lockfile-remove "$KNOWN_HOSTS" # note if the known_hosts file was updated - if [ "$nHostsOK" -gt 0 -o "$nHostsBAD" -gt 0 ] ; then + if [ "$(md5sum "$KNOWN_HOSTS")" != "$fileCheck" ] ; then log "known_hosts file updated." fi @@ -634,6 +638,7 @@ update_authorized_keys() { local nIDs local nIDsOK local nIDsBAD + local fileCheck # the number of ids specified on command line nIDs="$#" @@ -647,6 +652,9 @@ update_authorized_keys() { # create a lockfile on authorized_keys lockfile-create "$AUTHORIZED_KEYS" + # note pre update file checksum + fileCheck=$(md5sum "$AUTHORIZED_KEYS") + for userID ; do # process the user ID, change return code if key not found for # user ID @@ -670,7 +678,7 @@ update_authorized_keys() { lockfile-remove "$AUTHORIZED_KEYS" # note if the authorized_keys file was updated - if [ "$nIDsOK" -gt 0 -o "$nIDsBAD" -gt 0 ] ; then + if [ "$(md5sum "$AUTHORIZED_KEYS")" != "$fileCheck" ] ; then log "authorized_keys file updated." fi @@ -700,7 +708,7 @@ process_authorized_user_ids() { log "processing authorized_user_ids file..." - if ! meat "$authorizedUserIDs" ; then + if ! meat "$authorizedUserIDs" > /dev/null ; then log "no user IDs to process." return fi -- cgit v1.2.3 From 85165312ef23dcf1ae6b1ac9eb2e907400d30ace Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Sun, 3 Aug 2008 18:58:19 -0400 Subject: some notes about george, added my full contact info to the download page of the web site. --- doc/george/changelog | 6 ++++++ website/download.mdwn | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/george/changelog b/doc/george/changelog index 45834d6..9cc628a 100644 --- a/doc/george/changelog +++ b/doc/george/changelog @@ -6,6 +6,12 @@ * Please add new entries in reverse chronological order whenever you make * * changes to this system (first command at top, last at bottom) * ****************************************************************************** + +2008-08-03 - dkg + * aptitude update && aptitude dist-upgrade + * installed iproute + * added my User ID to ~webmaster/.config/monkeysphere/authorized_user_ids + 2008-08-02 - jrollins * aptitude update && aptitude dist-upgrade * restarted cron, nullmailer, sshd diff --git a/website/download.mdwn b/website/download.mdwn index 947b171..9a4c88e 100644 --- a/website/download.mdwn +++ b/website/download.mdwn @@ -20,13 +20,13 @@ development model with [git](http://git.or.cz/). Once you've [installed git](http://www.spheredev.org/wiki/Git_for_the_lazy), you can [git clone](http://www.kernel.org/pub/software/scm/git/docs/git-clone.html) -any of the developer repositories: +any of the developer repositories, including: Jameson Graef Rollins : git clone http://lair.fifthhorseman.net/~jrollins/git/monkeysphere.git monkeysphere -dkg: +Daniel Kahn Gillmor : git clone http://lair.fifthhorseman.net/~dkg/git/monkeysphere.git monkeysphere -- cgit v1.2.3