summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xMakefile2
-rw-r--r--doc/george/changelog5
-rw-r--r--man/man1/openpgp2ssh.11
3 files changed, 7 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index e40c4b1..8d9ab2f 100755
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ install: all installman
mkdir -p $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/sbin $(DESTDIR)$(PREFIX)/share/monkeysphere
mkdir -p $(DESTDIR)$(PREFIX)/share/doc/monkeysphere
mkdir -p $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere
- install src/monkeysphere src/monkeysphere-ssh-proxycommand src/keytrans/openpgp2ssh $(DESTDIR)$(PREFIX)/bin
+ install src/monkeysphere src/monkeysphere-ssh-proxycommand src/keytrans/openpgp2ssh src/keytrans/pem2openpgp $(DESTDIR)$(PREFIX)/bin
install src/monkeysphere-server $(DESTDIR)$(PREFIX)/sbin
install -m 0644 src/common $(DESTDIR)$(PREFIX)/share/monkeysphere
install doc/* $(DESTDIR)$(PREFIX)/share/doc/monkeysphere
diff --git a/doc/george/changelog b/doc/george/changelog
index 99481c4..24e66f8 100644
--- a/doc/george/changelog
+++ b/doc/george/changelog
@@ -7,6 +7,11 @@
* changes to this system (first command at top, last at bottom) *
******************************************************************************
+2009-01-30 - micah
+ * Replaced nullmailer with postfix, nullmailer doesn't handle aliases
+ and insisted either on constantly respooling mail when there was no
+ where to go.
+
2009-01-24 - micah
* Configured /etc/aliases to have root go to mjgoins, micah, dkg, jrollins
* Configured /etc/nullmailer/remotes to have mail.riseup.net so remote delivery will work
diff --git a/man/man1/openpgp2ssh.1 b/man/man1/openpgp2ssh.1
index 89df047..8374a9f 100644
--- a/man/man1/openpgp2ssh.1
+++ b/man/man1/openpgp2ssh.1
@@ -90,6 +90,7 @@ only acts on keys associated with the first primary key
passed in. If you send it more than one primary key, it will silently
ignore later ones.
.Sh SEE ALSO
+.Xr pem2openpgp 1 ,
.Xr monkeysphere 1 ,
.Xr monkeysphere 7 ,
.Xr ssh 1 ,