From c33b2a86d47a536b20bce8cb15ee5c23dd9eaec7 Mon Sep 17 00:00:00 2001 From: Jameson Rollins Date: Mon, 8 Mar 2010 23:36:45 -0500 Subject: fix my email address --- man/man1/monkeysphere.1 | 2 +- man/man7/monkeysphere.7 | 2 +- man/man8/monkeysphere-authentication.8 | 2 +- man/man8/monkeysphere-host.8 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'man') diff --git a/man/man1/monkeysphere.1 b/man/man1/monkeysphere.1 index 6abd36c..4d8eab6 100644 --- a/man/man1/monkeysphere.1 +++ b/man/man1/monkeysphere.1 @@ -201,7 +201,7 @@ added to the given user's authorized_keys file. .SH AUTHOR Written by: -Jameson Rollins , +Jameson Rollins , Daniel Kahn Gillmor .SH SEE ALSO diff --git a/man/man7/monkeysphere.7 b/man/man7/monkeysphere.7 index e4c2bf0..666b831 100644 --- a/man/man7/monkeysphere.7 +++ b/man/man7/monkeysphere.7 @@ -75,7 +75,7 @@ https://host.example.com[:port] .SH AUTHOR Written by: -Jameson Rollins , +Jameson Rollins , Daniel Kahn Gillmor .SH SEE ALSO diff --git a/man/man8/monkeysphere-authentication.8 b/man/man8/monkeysphere-authentication.8 index b2dfbdf..8732157 100644 --- a/man/man8/monkeysphere-authentication.8 +++ b/man/man8/monkeysphere-authentication.8 @@ -189,7 +189,7 @@ added to the given user's authorized_keys file. .SH AUTHOR This man page was written by: -Jameson Rollins , +Jameson Rollins , Daniel Kahn Gillmor , Matthew Goins diff --git a/man/man8/monkeysphere-host.8 b/man/man8/monkeysphere-host.8 index 4735940..00ea777 100644 --- a/man/man8/monkeysphere-host.8 +++ b/man/man8/monkeysphere-host.8 @@ -226,7 +226,7 @@ of all imported secret keys (this is the host's GNUPGHOME directory). .SH AUTHOR This man page was written by: -Jameson Rollins , +Jameson Rollins , Daniel Kahn Gillmor , Matthew Goins -- cgit v1.2.3 From 3f7d3ab53390e4b69694cbddfdd97ebb14fa7790 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Tue, 9 Mar 2010 00:47:48 -0500 Subject: fixed monkeysphere.7 synopsis to be less ssh-specific --- man/man7/monkeysphere.7 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'man') diff --git a/man/man7/monkeysphere.7 b/man/man7/monkeysphere.7 index 666b831..4d1deca 100644 --- a/man/man7/monkeysphere.7 +++ b/man/man7/monkeysphere.7 @@ -1,9 +1,8 @@ -.TH MONKEYSPHERE "7" "March 2009" "monkeysphere" "System Frameworks" +.TH MONKEYSPHERE "7" "March 2010" "monkeysphere" "System Frameworks" .SH NAME -monkeysphere - ssh authentication framework using OpenPGP Web of -Trust +monkeysphere - ssh and TLS authentication framework using OpenPGP Web of Trust .SH DESCRIPTION -- cgit v1.2.3 From 24da4d0207c8d3c7586871dac3eea9d2a0b864c3 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Sun, 14 Mar 2010 03:06:32 -0400 Subject: enable use of hkps (closes: MS #1749) --- man/man8/monkeysphere-authentication.8 | 5 +++++ src/share/ma/setup | 1 + 2 files changed, 6 insertions(+) (limited to 'man') diff --git a/man/man8/monkeysphere-authentication.8 b/man/man8/monkeysphere-authentication.8 index 8732157..ea9debd 100644 --- a/man/man8/monkeysphere-authentication.8 +++ b/man/man8/monkeysphere-authentication.8 @@ -177,6 +177,11 @@ false may expose users to abuse by other users on the system. (true) /etc/monkeysphere/monkeysphere\-authentication.conf System monkeysphere-authentication config file. .TP +/etc/monkeysphere/monkeysphere\-authentication\-x509\-anchors.crt +If monkeysphere-authentication is configured to query an hkps +keyserver, it will use X.509 Certificate Authority certificates in +this file to validate any X.509 certificates used by the keyserver. +.TP /var/lib/monkeysphere/authorized_keys/USER Monkeysphere-generated user authorized_keys files. .TP diff --git a/src/share/ma/setup b/src/share/ma/setup index 6c75fef..f965487 100644 --- a/src/share/ma/setup +++ b/src/share/ma/setup @@ -43,6 +43,7 @@ EOF # Edits will be overwritten. no-greeting list-options show-uid-validity +keyserver-options ca-cert-file=${SYSCONFIGDIR}/monkeysphere-authentication-x509-anchors.crt EOF # make sure the monkeysphere user owns everything in the sphere -- cgit v1.2.3