added some examples for system integration

diff --git a/Changelog b/Changelog
index 42f4f4efe0d45567817c4923b32792aa49a75ab2..7ad6a7068f92fe7ac8dba5f3cb4b1fb48400030a 100644 (file)
--- 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 7662f7b54fd1fd7b2dc3ba9321a07aa99e4196b9..66449275a42ca257848f2c24d57af79cddc4ace6 100755 (executable)
--- 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 (file)
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 (file)
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 (file)
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)