From 9b594d761d60fad6444b26ff3d41708e1c138abf Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Thu, 15 Jul 2010 17:02:08 -0400 Subject: added some examples for system integration --- Changelog | 2 ++ Makefile | 4 +++- examples/crontab | 6 ++++++ examples/ssh_config | 4 ++++ examples/sshd_config | 6 ++++++ 5 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 examples/crontab create mode 100644 examples/ssh_config create mode 100644 examples/sshd_config diff --git a/Changelog b/Changelog index 42f4f4e..7ad6a70 100644 --- a/Changelog +++ b/Changelog @@ -7,6 +7,8 @@ monkeysphere (0.31~pre) UNRELEASED; urgency=low declines to publish one of the keys key (closes MS #1945) * report updated expiration date upon successful conclusion of m-h set-expire (closes MS #2291) + * added some files in examples/ to demonstrate system integration + with OpenSSH [ Jameson Rollins ] * add keys-for-user subcommand to monkeysphere-authentication diff --git a/Makefile b/Makefile index 7662f7b..6644927 100755 --- a/Makefile +++ b/Makefile @@ -54,7 +54,9 @@ install: all installman install -m 0644 src/share/m/* $(DESTDIR)$(PREFIX)/share/monkeysphere/m install -m 0644 src/share/mh/* $(DESTDIR)$(PREFIX)/share/monkeysphere/mh install -m 0644 src/share/ma/* $(DESTDIR)$(PREFIX)/share/monkeysphere/ma - install Changelog $(DESTDIR)$(PREFIX)/share/doc/monkeysphere + install -m 0644 Changelog $(DESTDIR)$(PREFIX)/share/doc/monkeysphere + install -d $(DESTDIR)$(PREFIX)/share/doc/monkeysphere/examples + install -m 0644 examples/* $(DESTDIR)$(PREFIX)/share/doc/monkeysphere/examples install -m 0644 etc/monkeysphere.conf $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere/monkeysphere.conf$(ETCSUFFIX) install -m 0644 etc/monkeysphere-host.conf $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere/monkeysphere-host.conf$(ETCSUFFIX) install -m 0644 etc/monkeysphere-authentication.conf $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere/monkeysphere-authentication.conf$(ETCSUFFIX) diff --git a/examples/crontab b/examples/crontab new file mode 100644 index 0000000..ab26c9d --- /dev/null +++ b/examples/crontab @@ -0,0 +1,6 @@ +# example Monkeysphere cron job: + +# Hourly: update the per-user authorized_keys in /var based on +# ~/.monkeysphere/authorized_user_ids + +36 * * * * root /usr/sbin/monkeysphere-authentication update-users diff --git a/examples/ssh_config b/examples/ssh_config new file mode 100644 index 0000000..b6746a1 --- /dev/null +++ b/examples/ssh_config @@ -0,0 +1,4 @@ +# Monkeysphere ssh config stanza (for ~/.ssh/config or /etc/ssh_config) +# This checks for host keys in the OpenPGP WoT: +Host * +ProxyCommand monkeysphere ssh-proxycommand %h %p diff --git a/examples/sshd_config b/examples/sshd_config new file mode 100644 index 0000000..30368ca --- /dev/null +++ b/examples/sshd_config @@ -0,0 +1,6 @@ +# Monkeysphere sshd config (for use in /etc/sshd_config) +# This checks for user keys in the OpenPGP WoT: +AuthorizedKeysFile /var/lib/monkeysphere/authorized_keys/%u + +# be sure to also add a scheduled job to update these keys +# (see the example cronjob) -- cgit v1.2.3