From 7cf229c19f9907e816228c34a74aa3025ae5503f Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Mon, 1 Sep 2008 21:16:49 -0400 Subject: including instructions to generate logo.png from logo.svg --- doc/artwork/Makefile | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 doc/artwork/Makefile (limited to 'doc') diff --git a/doc/artwork/Makefile b/doc/artwork/Makefile new file mode 100644 index 0000000..b0cb37a --- /dev/null +++ b/doc/artwork/Makefile @@ -0,0 +1,2 @@ +logo.png: logo.svg + inkscape -e logo.png logo.svg -- cgit v1.2.3 From e6d6c460cbe45ef8e87020bc775772cb71a5b861 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Tue, 2 Sep 2008 00:59:16 -0400 Subject: moved all apt repository references to archive.monkeysphere.info. --- doc/george/changelog | 5 +++++ website/download.mdwn | 8 ++++---- website/getting-started-user.mdwn | 4 ++-- website/news/apt-repo-moved.mdwn | 8 ++++++++ website/news/modified-gnutls-2.4.x-available.mdwn | 4 ++-- 5 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 website/news/apt-repo-moved.mdwn (limited to 'doc') diff --git a/doc/george/changelog b/doc/george/changelog index fcd5a12..1ed81d4 100644 --- a/doc/george/changelog +++ b/doc/george/changelog @@ -7,6 +7,11 @@ * changes to this system (first command at top, last at bottom) * ****************************************************************************** +2008-09-01 - dkg + * set up http://dkg.monkeysphere.info so that i could play around + with ikiwiki updates + * moved apt repository over to http://archive.monkeysphere.info/ + 2008-08-26 - dkg * aptitude update && aptitude full-upgrade * added account 'daniel' for Dan Scott, and set him up with a way diff --git a/website/download.mdwn b/website/download.mdwn index 9986a04..b64711d 100644 --- a/website/download.mdwn +++ b/website/download.mdwn @@ -8,8 +8,8 @@ by following these directions: You can add this repo to your system by putting the following lines in /etc/apt/sources.list.d/monkeysphere.list: - deb http://monkeysphere.info/debian experimental monkeysphere - deb-src http://monkeysphere.info/debian experimental monkeysphere + deb http://archive.monkeysphere.info/debian experimental monkeysphere + deb-src http://archive.monkeysphere.info/debian experimental monkeysphere The repository is currently signed by [Daniel Kahn Gillmor's OpenPGP key](http://fifthhorseman.net/dkg.gpg "dkg's key"), key id D21739E9 @@ -34,7 +34,7 @@ You can install a patched version of GnuTLS to enable this feature of the MonkeySphere by adjusting the monkeysphere `sources.list` lines to include the `gnutls` component. So they'd look like this instead: - deb http://monkeysphere.info/debian experimental monkeysphere gnutls - deb-src http://monkeysphere.info/debian experimental monkeysphere gnutls + deb http://archive.monkeysphere.info/debian experimental monkeysphere gnutls + deb-src http://archive.monkeysphere.info/debian experimental monkeysphere gnutls You can [read more about this offering](/news/modified-gnutls-2.4.x-available). diff --git a/website/getting-started-user.mdwn b/website/getting-started-user.mdwn index 5cb96b9..3f7b689 100644 --- a/website/getting-started-user.mdwn +++ b/website/getting-started-user.mdwn @@ -92,8 +92,8 @@ to take this step, you will need to upgrade to a patched version of gnutls. You can easily upgrade a Debian system by adding the following to `/etc/apt/sources.list.d/monkeysphere.list`: - deb http://monkeysphere.info/debian experimental gnutls - deb-src http://monkeysphere.info/debian experimental gnutls + deb http://archive.monkeysphere.info/debian experimental gnutls + deb-src http://archive.monkeysphere.info/debian experimental gnutls Next, run `aptitude update; aptitude install libgnutls26`. diff --git a/website/news/apt-repo-moved.mdwn b/website/news/apt-repo-moved.mdwn new file mode 100644 index 0000000..8f0bf81 --- /dev/null +++ b/website/news/apt-repo-moved.mdwn @@ -0,0 +1,8 @@ +[[meta title="APT repository moved"]] + +The monkeysphere APT repository has been moved from +`http://monkeysphere.info/debian` to +`http://archive.monkeysphere.info/debian`. You'll probably want to +update your `sources.list` to match the [official lines](/download). + +Apologies for any confusion or hassle this causes! diff --git a/website/news/modified-gnutls-2.4.x-available.mdwn b/website/news/modified-gnutls-2.4.x-available.mdwn index b3db308..44e08d0 100644 --- a/website/news/modified-gnutls-2.4.x-available.mdwn +++ b/website/news/modified-gnutls-2.4.x-available.mdwn @@ -9,8 +9,8 @@ circumstances. You can track this package in debian lenny by adding the following lines to `/etc/apt/sources.list`: - deb http://monkeysphere.info/debian experimental gnutls - deb-src http://monkeysphere.info/debian experimental gnutls + deb http://archive.monkeysphere.info/debian experimental gnutls + deb-src http://archive.monkeysphere.info/debian experimental gnutls Or you can patch and build the packages yourself with the patches and scripts provided in [the MonkeySphere git repo](/download). -- cgit v1.2.3 From 76e67ee7418efcb51788e5577f3f09d28c02709a Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Tue, 2 Sep 2008 01:05:33 -0400 Subject: more updates as i pursue service-specific hostnames. --- debian/changelog | 2 ++ debian/control | 4 ++-- doc/george/changelog | 1 + website/community.mdwn | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/debian/changelog b/debian/changelog index 9a46d9e..76e4d04 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ monkeysphere (0.12-1) UNRELEASED; urgency=low * Improved output handling. + * debian/control: switched Homepage: and Vcs-Git: to canonicalized + upstream hostnames. -- Jameson Graef Rollins Sun, 24 Aug 2008 23:49:23 -0700 diff --git a/debian/control b/debian/control index 2984464..ca07a5d 100644 --- a/debian/control +++ b/debian/control @@ -5,8 +5,8 @@ Maintainer: Daniel Kahn Gillmor Uploaders: Jameson Rollins Build-Depends: debhelper (>= 7.0), libgnutls-dev (>= 2.4.0), git-core Standards-Version: 3.8.0.1 -Homepage: http://monkeysphere.info/ -Vcs-Git: git://monkeysphere.info/monkeysphere +Homepage: http://web.monkeysphere.info/ +Vcs-Git: git://git.monkeysphere.info/monkeysphere Dm-Upload-Allowed: yes Format: 3.0 (git) diff --git a/doc/george/changelog b/doc/george/changelog index 1ed81d4..5c2f010 100644 --- a/doc/george/changelog +++ b/doc/george/changelog @@ -11,6 +11,7 @@ * set up http://dkg.monkeysphere.info so that i could play around with ikiwiki updates * moved apt repository over to http://archive.monkeysphere.info/ + * aptitude update && aptitude dist-upgrade 2008-08-26 - dkg * aptitude update && aptitude full-upgrade diff --git a/website/community.mdwn b/website/community.mdwn index 4cbd9cd..c878fc2 100644 --- a/website/community.mdwn +++ b/website/community.mdwn @@ -22,7 +22,7 @@ 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) from this web site: - git clone git://monkeysphere.info/monkeysphere + git clone git://git.monkeysphere.info/monkeysphere ### Individual developer repositories ### -- cgit v1.2.3 From e2e87dd0cba22432aa16151bafe5db0b145a3478 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Tue, 2 Sep 2008 01:12:52 -0400 Subject: completing the service-specific hostname canonicalization (i think). --- doc/announcement.html | 13 ++++++++----- doc/george/changelog | 2 ++ src/monkeysphere-server | 2 +- website/bugs/add-man-pages-to-website.mdwn | 2 +- 4 files changed, 12 insertions(+), 7 deletions(-) (limited to 'doc') diff --git a/doc/announcement.html b/doc/announcement.html index 1787142..68607ac 100644 --- a/doc/announcement.html +++ b/doc/announcement.html @@ -30,8 +30,8 @@ key) across a group of machines by disabling authentication for that user?

A group of us have been working on a public key infrastructure for -SSH. Monkeysphere makes use of -the existing OpenPGP web-of-trust to fetch and cryptographically +SSH. Monkeysphere makes use +of the existing OpenPGP web-of-trust to fetch and cryptographically validate (and revoke!) keys. This works in either directions: both authorized_keys and known_hosts are handled. Monkeysphere gives users and admins tools to deal with SSH @@ -39,14 +39,17 @@ keys by thinking about the people and machines to whom the keys belong, instead of requiring humans to do tedious (and error-prone) manual key verification.

-

We have debian packages +

We have debian packages available which should install against lenny, a mailing list, and open ears for good questions, suggestions and criticism.

-

If you have a chance to give it a try (as a user -or as an admin), it would be great to If you have a chance to give it a try (as a +user or as an +admin), it would be great to get feedback.

diff --git a/doc/george/changelog b/doc/george/changelog index 5c2f010..8b03a7f 100644 --- a/doc/george/changelog +++ b/doc/george/changelog @@ -12,6 +12,8 @@ with ikiwiki updates * moved apt repository over to http://archive.monkeysphere.info/ * aptitude update && aptitude dist-upgrade + * canonicalizing hostname for normal web access to + http://web.monkeysphere.info 2008-08-26 - dkg * aptitude update && aptitude full-upgrade diff --git a/src/monkeysphere-server b/src/monkeysphere-server index 4c8ecdc..2966f7c 100755 --- a/src/monkeysphere-server +++ b/src/monkeysphere-server @@ -469,7 +469,7 @@ revoke_hostname() { echo "WARNING: There is a known bug in this function." echo "This function has been known to occasionally revoke the wrong user ID." echo "Please see the following bug report for more information:" - echo "http://monkeysphere.info/bugs/revoke-hostname-revoking-wrong-userid/" + echo "http://web.monkeysphere.info/bugs/revoke-hostname-revoking-wrong-userid/" read -p "Are you sure you would like to proceed? (y/N) " OK; OK=${OK:=N} if [ ${OK/y/Y} != 'Y' ] ; then failure "aborting." diff --git a/website/bugs/add-man-pages-to-website.mdwn b/website/bugs/add-man-pages-to-website.mdwn index 4a8d2e2..399438a 100644 --- a/website/bugs/add-man-pages-to-website.mdwn +++ b/website/bugs/add-man-pages-to-website.mdwn @@ -1,7 +1,7 @@ [[meta title="Add man pages to web site"]] We should publish the various monkeysphere man pages in browsable form -somewhere under http://monkeysphere.info/. Ideally, this would be +somewhere under http://web.monkeysphere.info/. Ideally, this would be updated automatically from the sources for the official man pages themselves. -- cgit v1.2.3 From 212c4e507b0a96a05fa8ee4232e821c77285eebf Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Tue, 2 Sep 2008 02:00:31 -0400 Subject: included todo entry about porting monkeysphere to other OSes. --- doc/TODO | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc') diff --git a/doc/TODO b/doc/TODO index 733986e..b41d2be 100644 --- a/doc/TODO +++ b/doc/TODO @@ -95,3 +95,7 @@ Fix behavior when add-identity-certifier fails to fetch a key from the Allow server administrators to add-identity-certifier from a key in the filesystem (or on stdin, etc) + +Think about packaging monkeysphere for other (non-apt-based) operating + systems. RPM-based linux systems, FreeBSD ports, and Mac OS X seem + like the most likely candidates. -- cgit v1.2.3