diff options
| author | Jameson Graef Rollins <jrollins@phys.columbia.edu> | 2008-10-27 07:39:58 -0400 |
|---|---|---|
| committer | Jameson Graef Rollins <jrollins@phys.columbia.edu> | 2008-10-27 07:39:58 -0400 |
| commit | b1438d7d0fcb9c98ee176ab0a75e1d37d11e26d4 (patch) | |
| tree | 60361f92c06ebf371cd7d28964f7bc929f285859 /etc | |
| parent | 5a8f2f1b6e5557ef8680bd1025239dcfd3f6550f (diff) | |
Move to using empty string for not using a user-controlled
authorized_keys file in RAW_AUTHORIZED_KEYS variable.
Fix spelling mistakes and wording in config files.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/monkeysphere-server.conf | 23 | ||||
| -rw-r--r-- | etc/monkeysphere.conf | 8 |
2 files changed, 15 insertions, 16 deletions
diff --git a/etc/monkeysphere-server.conf b/etc/monkeysphere-server.conf index adbac7e..2693699 100644 --- a/etc/monkeysphere-server.conf +++ b/etc/monkeysphere-server.conf @@ -1,9 +1,9 @@ -# MonkeySphere server configuration file. +# Monkeysphere server configuration file. # This is an sh-style shell configuration file. Variable names should -# be separated from their assignements by a single '=' and no spaces. -# Environement variables with the same names as these variables but -# prefeced by "MONKEYSPHERE_" will take precedence over the values +# be separated from their assignments by a single '=' and no spaces. +# Environment variables with the same names as these variables but +# prefaced by "MONKEYSPHERE_" will take precedence over the values # specified here. # User who controls the monkeysphere authentication keyring. @@ -15,15 +15,14 @@ # 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. +# of the user, and '%u' will be replaced by the username of the user. # For purely admin-controlled authorized_user_ids, you might put them -# in /etc/monkeysphere/authorized_user_ids/%u +# in /etc/monkeysphere/authorized_user_ids/%u, for instance. #AUTHORIZED_USER_IDS="%h/.monkeysphere/authorized_user_ids" -# 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 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? +# Path to a user controlled authorized_keys file to be added to the +# monkeysphere-generated authorized_keys file. '%h' will be replaced +# by the home directory of the user, and '%u' will by replaced by the +# username of the user. To not add any user-controlled file set this +# variable to be the empty string, "". #RAW_AUTHORIZED_KEYS="%h/.ssh/authorized_keys" diff --git a/etc/monkeysphere.conf b/etc/monkeysphere.conf index a45fff0..92aa419 100644 --- a/etc/monkeysphere.conf +++ b/etc/monkeysphere.conf @@ -1,9 +1,9 @@ -# MonkeySphere system-wide client configuration file. +# Monkeysphere system-wide client configuration file. # This is an sh-style shell configuration file. Variable names should -# be separated from their assignements by a single '=' and no spaces. -# Environement variables with the same names as these variables but -# prefeced by "MONKEYSPHERE_" will take precedence over the values +# be separated from their assignments by a single '=' and no spaces. +# Environment variables with the same names as these variables but +# prefaced by "MONKEYSPHERE_" will take precedence over the values # specified here. # Log level. Can be SILENT, ERROR, INFO, DEBUG, in increasing order |