diff options
| author | Jameson Graef Rollins <jrollins@phys.columbia.edu> | 2008-09-03 17:12:24 -0700 |
|---|---|---|
| committer | Jameson Graef Rollins <jrollins@phys.columbia.edu> | 2008-09-03 17:12:24 -0700 |
| commit | ba1d8c2b29be76bae9b4631de848ce45cfee6edd (patch) | |
| tree | 755df6d0d88dbfcd312b53b1b6f6b68f5c93398f /website | |
| parent | f0d37a783d26987fe85f3e609e27df9632dc9387 (diff) | |
| parent | d5430fdb227a15f678f69b4b1b175e9d308df3db (diff) | |
Merge commit 'dkg/master'
Diffstat (limited to 'website')
| -rw-r--r-- | website/bugs/monkeysphere-should-respect-keyserver-settings-in-gpg.mdwn | 4 | ||||
| -rw-r--r-- | website/bugs/setup-test-server-for-public.mdwn | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/website/bugs/monkeysphere-should-respect-keyserver-settings-in-gpg.mdwn b/website/bugs/monkeysphere-should-respect-keyserver-settings-in-gpg.mdwn index 85f79f1..0630cc4 100644 --- a/website/bugs/monkeysphere-should-respect-keyserver-settings-in-gpg.mdwn +++ b/website/bugs/monkeysphere-should-respect-keyserver-settings-in-gpg.mdwn @@ -4,14 +4,14 @@ Currently, monkeysphere-ssh-proxycommand checks the following places to determine which keyserver to use (in order of priority): * environment variable (MONKEYSPHERE_KEYSERVER) - * KEYSERVER variable in ~/.config/monkeysphere/monkeysphere.conf + * KEYSERVER variable in ~/.monkeysphere/monkeysphere.conf * default value of subkeys.pgp.net It would be useful if monkeysphere also consulted ~/.gnupg/gpg.conf, using the following order instead: * environment variable (MONKEYSPHERE_KEYSERVER) - * KEYSERVER variable in ~/.config/monkeysphere/monkeysphere.conf + * KEYSERVER variable in ~/.monkeysphere/monkeysphere.conf * keyserver variable in ~/.gnupg/gpg.conf * default value of subkeys.pgp.net diff --git a/website/bugs/setup-test-server-for-public.mdwn b/website/bugs/setup-test-server-for-public.mdwn index 5b05759..65fa893 100644 --- a/website/bugs/setup-test-server-for-public.mdwn +++ b/website/bugs/setup-test-server-for-public.mdwn @@ -63,7 +63,7 @@ I envision a script you'd invoke like: root@george# addmsuser foo 'Foo T. Bar <foo@example.org>' Which would create the `foo` account, populate -`~foo/.config/monkeysphere/authorized_user_ids`, make a note in a log +`~foo/.monkeysphere/authorized_user_ids`, make a note in a log someplace, and send a welcome letter. --dkg |