diff options
| author | Matt Goins <mjgoins@openflows.com> | 2008-06-25 01:59:19 -0400 |
|---|---|---|
| committer | Matt Goins <mjgoins@openflows.com> | 2008-06-25 01:59:19 -0400 |
| commit | 43097e923b8051ecd0912e367c1cd78149a97dbe (patch) | |
| tree | e0553c718ea443a9f7f08a50c6ef1f7c9a9d953a /etc/monkeysphere-server.conf | |
| parent | c1a5568ee2f6c46501df057a71f23681ea0194ec (diff) | |
| parent | e0b50e3859931c7fe2a58bb08af440a4f2455174 (diff) | |
Merge branch 'master' of http://lair.fifthhorseman.net/~dkg/git/monkeysphere
Diffstat (limited to 'etc/monkeysphere-server.conf')
| -rw-r--r-- | etc/monkeysphere-server.conf | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/etc/monkeysphere-server.conf b/etc/monkeysphere-server.conf index 847e879..defb0f7 100644 --- a/etc/monkeysphere-server.conf +++ b/etc/monkeysphere-server.conf @@ -3,20 +3,9 @@ # This is an sh-style shell configuration file. Variable names should # be separated from their assignements by a single '=' and no spaces. -# GPG home directory for server -#GNUPGHOME=/etc/monkeysphere/gnupg - # GPG keyserver to search for keys #KEYSERVER=subkeys.pgp.net -# Required user key capabilities -# Must be quoted, lowercase, space-seperated list of the following: -# e = encrypt -# s = sign -# c = certify -# a = authentication -#REQUIRED_USER_KEY_CAPABILITY="a" - # Path to authorized_user_ids file to process to create # authorized_keys file. '%h' will be replaced by the home directory # of the user, and %u will be replaced by the username of the user. @@ -26,6 +15,8 @@ # Whether to add user controlled authorized_keys file to # monkeysphere-generated authorized_keys file. Should be path to file -# where '%h' will be replaced by the home directory of the user. -# To not add any user-controlled file, put "-" -#USER_CONTROLLED_AUTHORIZED_KEYS="%h/.ssh/authorized_keys" +# where '%h' will be replaced by the home directory of the user or +# '%u' by the username. To not add any user-controlled file, put "-" +# FIXME: this usage of "-" contravenes the normal convention where "-" +# means standard in/out. Why not use "none" or "" instead? +#RAW_AUTHORIZED_KEYS="%h/.ssh/authorized_keys" |