From 2e49fd875c65c99aef7c9f44e68a261c61859ec7 Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Sun, 2 Nov 2008 19:04:44 -0500 Subject: update download section of website to include freebsd info. --- website/download.mdwn | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/website/download.mdwn b/website/download.mdwn index e5ea72c..5551b52 100644 --- a/website/download.mdwn +++ b/website/download.mdwn @@ -2,6 +2,8 @@ # Downloading and Installing # +## Debian ## + If you are running a Debian system, you can install Monkeysphere by following these directions: @@ -26,15 +28,38 @@ Once you've installed the packages, you might want to read up on how to get started [as a regular user](/getting-started-user) or [as a systems administrator](/getting-started-admin). +## FreeBSD ## + +There is [now a FreeBSD port available](/news/FreeBSD-port-available/) +for the Monkeysphere. + +While the monkeysphere is not officially included in the ports tree +yet, [a problem +report](http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/128406) has +been submitted, and the package itself is functional. + +The latest version of the ports directory can be found in [the git +repository](/community) under +`packaging/freebsd/security/monkeysphere`. Please [let us +know](/community) if you encounter any problems with it on a FreeBSD +system. + +Until the port is accepted, you should be able to build the latest +port with: + + git clone git://git.monkeysphere.info/monkeysphere + cp -a monkeysphere/packaging/freebsd/security/monkeysphere /usr/ports/security + cd /usr/ports/security/monkeysphere + make && make install + ## Source ## -For people who can't use the debian package, or folks who just want to -look at the source, we recommend [using git](/community). +For those that would like to download the source directly, [the source +is available](/community) via [git](http://git.or.cz/). -But if you want a tarball of the most recent release, we publish those -too. The [latest +The [latest tarball](http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.19.orig.tar.gz) -has these checksums: +is also available, and has these checksums: 
 -----BEGIN PGP SIGNED MESSAGE-----
-- 
cgit v1.2.3


From e36adf0656188ddb03f4302f3dc9f9a36b9884c0 Mon Sep 17 00:00:00 2001
From: Micah Anderson 
Date: Tue, 4 Nov 2008 15:45:09 -0500
Subject: Reworked the download page to link from "add this key to your apt
 configuration" to the /archive-key page, pushing the SecureApt reference link
 into that page. This has a streamlining affect on new users wanting to get
 started as it links directly to the archive-key page where there are explicit
 instructions for how to do the archive key verification and then the
 follow-up add to the apt keyring for proper archive/package verification. The
 way it was before, you were given the link to the more general SecureApt
 debian wiki page, which was a lot of information, when in most cases people
 just want to know what steps they need to know to do the
 verification/addition. However, the link to the SecureApt page is valuable to
 reference, it just makes more sense to be embedded in the page which
 explicitly deals with that.

This also means I added information about how to add the key to the
apt keyring into the archive-key page. In doing so, I removed the
dkg-specific prompt (not because I dont like it, but because it would
have been funny for me to add more commands and have to manually
construct his prompt to maintain consistency on the page). Also, added
some output of commands so people have an idea what to expect.
---
 website/archive-key.mdwn | 30 ++++++++++++++++++++++--------
 website/download.mdwn    |  7 +++----
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/website/archive-key.mdwn b/website/archive-key.mdwn
index 45ac86e..6658469 100644
--- a/website/archive-key.mdwn
+++ b/website/archive-key.mdwn
@@ -4,30 +4,44 @@
 ## Verifying the key ##
 
 The [Monkeysphere apt repository](/download) is signed by this key, so
-you can verify that the packages come from the right place and have
-not been tampered with.
+you [can verify](http://wiki.debian.org/SecureApt) that the packages
+come from the right place and have not been tampered with.
 
 This key is certified by several of the Monkeysphere developers, and
 should be able to be found from the public keyservers with:
 
-	gpg --keyserver $KEYSERVER --recv EB8AF314
+	$ gpg --recv-key EB8AF314
+	gpg: requesting key EB8AF314 from hkp server pool.sks-keyservers.net
+	gpg: key EB8AF314: public key "Monkeysphere Archive Signing Key (http://archive.monkeysphere.info/debian)" imported
+	gpg: no ultimately trusted keys found
+	gpg: Total number processed: 1
+	gpg:               imported: 1  (RSA: 1)
+	$
 
 You should be able to verify the fingerprint like this:
 
-	[0 dkg@squeak ~]$ gpg --list-key --fingerprint http://archive.monkeysphere.info/debian
+	$ gpg --list-key --fingerprint http://archive.monkeysphere.info/debian
 	pub   4096R/EB8AF314 2008-09-02 [expires: 2009-09-02]
 	      Key fingerprint = 2E8D D26C 53F1 197D DF40  3E61 18E6 67F1 EB8A F314
 	uid       [  full  ] Monkeysphere Archive Signing Key (http://archive.monkeysphere.info/debian)
-	
-	[0 dkg@squeak ~]$ 
+	$ 
 
-And you can verify the fingerprints with:
+And you can also verify the fingerprints with:
  
-	gpg --list-sigs http://archive.monkeysphere.info/debian
+	$ gpg --list-sigs http://archive.monkeysphere.info/debian
 
 If you believe that the repository has been tampered with, please [let
 us know](/community)!
 
+If you have properly verified this key, you can add it to your apt
+keyring for proper cryptographic verification of the archive and its
+packages by doing the following:
+
+	 $ sudo gpg -a --export EB8AF314 | apt-key add -
+	 OK
+	 $ aptitude update
+	 ...
+
 ## The key itself ##
 
 
diff --git a/website/download.mdwn b/website/download.mdwn
index 5551b52..1f27fde 100644
--- a/website/download.mdwn
+++ b/website/download.mdwn
@@ -13,12 +13,11 @@ You can add this repo to your system by putting the following lines in
 	deb http://archive.monkeysphere.info/debian experimental monkeysphere
 	deb-src http://archive.monkeysphere.info/debian experimental monkeysphere
 
-The repository is currently signed by [The Monkeysphere archive
-signing key](/archive-key), key id EB8AF314 (fingerprint: `2E8D
+The repository is currently signed by the Monkeysphere archive
+signing key, key id EB8AF314 (fingerprint: `2E8D
 D26C 53F1 197D DF40 3E61 18E6 67F1 EB8A F314`).  To cryptographically
 verify the packages, you'll want to [add this key to your apt
-configuration after verifying its
-integrity](http://wiki.debian.org/SecureApt).
+configuration after verifying its integrity](/archive-key).
 
 To use the `monkeysphere subkey-to-ssh-agent` subcommand, you will
 also need [version 2.6 of GnuTLS](/news/gnutls-2.6-enables-monkeysphere),
-- 
cgit v1.2.3


From 7833a5e9da4c6e15eea7edfc38ae122360b37f1f Mon Sep 17 00:00:00 2001
From: Micah Anderson 
Date: Tue, 4 Nov 2008 16:09:47 -0500
Subject: create a new section of the getting started page that lets people
 know that they should install monkeysphere software at this point in their
 journey. It may be obvious, but I think in terms of providing a step-by-step
 howto get started guide, the least assumptions of obviousness we make, the
 better.

I also moved the information about making sure that you have the
gnutls requirements up to this install section.
---
 website/getting-started-user.mdwn | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/website/getting-started-user.mdwn b/website/getting-started-user.mdwn
index e0a2dab..66378dc 100644
--- a/website/getting-started-user.mdwn
+++ b/website/getting-started-user.mdwn
@@ -20,6 +20,16 @@ done with a simple cronjob.  An example of crontab line to do this is:
 
 This would refresh your keychain every day at noon.
 
+Install the monkeysphere software on your system
+------------------------------------------------
+
+If you haven't installed monkeysphere yet, you will need to [download
+and install] (/download) before continuing.
+
+Make sure that you have the GnuTLS library version 2.6 or later
+installed on your system. If you can't (or don't want to) upgrade to
+GnuTLS 2.6 or later, there are patches for GnuTLS 2.4 available in
+[the Monkeysphere git repo](/community).
 
 Keeping your `known_hosts` file in sync with your keyring
 -----------------------------------------------------------
@@ -93,10 +103,6 @@ you can feed your authentication subkey to your ssh agent by running:
 
 	$ monkeysphere subkey-to-ssh-agent
 
-If you can't (or don't want to) upgrade to GnuTLS 2.6 or later, there
-are patches for GnuTLS 2.4 available in [the Monkeysphere git
-repo](/community).
-
 FIXME: using the key with a single ssh connection?
 
 Establish trust
-- 
cgit v1.2.3