Merge commit 'micah/master'

diff --git a/packaging/freebsd/Makefile b/packaging/freebsd/Makefile
index cc3d93fc08b5d4c309539e8d626fd47fda6bde26..7a24dc58e1723fa8c18d9043b7eca8d63db25cbd 100644 (file)
--- a/packaging/freebsd/Makefile
+++ b/packaging/freebsd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=      monkeysphere
-PORTVERSION=   0.16~pre
+PORTVERSION=   0.16
 CATEGORIES=    security
 MASTER_SITES=  http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/
 # hack for debian orig tarballs

diff --git a/packaging/freebsd/distinfo b/packaging/freebsd/distinfo
index 3495f1a6d948ffa234db221d197e86cc83dc070c..16e88de4fb5044524ccbbd677203f9e13ab96c9c 100644 (file)
--- a/packaging/freebsd/distinfo
+++ b/packaging/freebsd/distinfo
@@ -1,3 +1,3 @@
-MD5 (monkeysphere_0.16~pre.orig.tar.gz) = 6e9489117794fa6afab8935b75cc5ccf
-SHA256 (monkeysphere_0.16~pre.orig.tar.gz) = fceab7cc77d9755e6484895ede56701b298ce3649bfcd10288a12803a565b7e5
-SIZE (monkeysphere_0.16~pre.orig.tar.gz) = 59721
+MD5 (monkeysphere_0.16.orig.tar.gz) = 4bc223e8004e0e374bd54f0315585c49
+SHA256 (monkeysphere_0.16.orig.tar.gz) = f2dbd031315f99c82099a4a902f2240cca97536b035ef75872e72a65f324c9d7
+SIZE (monkeysphere_0.16.orig.tar.gz) = 66062

diff --git a/website/bugs/setup-subcommand-for-monkeysphere-server.mdwn b/website/bugs/setup-subcommand-for-monkeysphere-server.mdwn
index c491f8b4efe35bc1c4e9508c6db9f97679afbfb1..a074d9e0b73ea6164fc66d823dc57ec80835312b 100644 (file)
--- a/website/bugs/setup-subcommand-for-monkeysphere-server.mdwn
+++ b/website/bugs/setup-subcommand-for-monkeysphere-server.mdwn
@@ -27,3 +27,30 @@ Would either of these be useful?  Are they confusing?  Could they be
 clarified?
 
 --dkg
+
+---
+
+I'm not sure how I feel about this idea.  I feel like it should just
+be the job of the package to setup the initial server environment.  I
+don't really feel like the admin should have to worry about it.  But
+then again, I can sort of see it from the point of view of someone
+just installing from source (but who the hell really does that
+anymore anyway?).
+
+I'm also sort of mixed about the setup --full idea as well.  At first
+I thought that it wasn't a good idea, and that I didn't like the idea
+of monkeysphere monkeying around with the config files of other
+packages (ie. ssh).  However, once I started to think about setting up
+monkeysphere on lots of servers, I started to think that it's maybe a
+good idea.  It might be good to have a single command that would just
+end with the server being on the monkeysphere:
+
+  * generate the server key
+  * modify sshd to point to it
+  * restart ssh
+  * publish the key to the keyserver
+
+So I'm starting to think that this might be a good idea.  Also curious
+what other think.
+
+-- jrollins