summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@phys.columbia.edu>2008-06-16 20:00:46 -0400
committerJameson Graef Rollins <jrollins@phys.columbia.edu>2008-06-16 20:00:46 -0400
commite619b23879fde5703da435141754324dcf7cfa53 (patch)
treeb469466288dbc7d2aa663c691bcf4095a5b65b53 /etc
parent114c8d24c679e2a2339700395bc32929c3b4dcba (diff)
parentdeb41134ca527508253244cfa8860a2031034825 (diff)
Merge branch 'master' into no-cache
Conflicts: src/common src/monkeysphere src/monkeysphere-ssh-proxycommand
Diffstat (limited to 'etc')
-rw-r--r--etc/monkeysphere-server.conf1
-rw-r--r--etc/monkeysphere.conf11
2 files changed, 6 insertions, 6 deletions
diff --git a/etc/monkeysphere-server.conf b/etc/monkeysphere-server.conf
index 82da497..3915bf4 100644
--- a/etc/monkeysphere-server.conf
+++ b/etc/monkeysphere-server.conf
@@ -20,4 +20,5 @@
# 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
diff --git a/etc/monkeysphere.conf b/etc/monkeysphere.conf
index d478b93..003ecf6 100644
--- a/etc/monkeysphere.conf
+++ b/etc/monkeysphere.conf
@@ -22,14 +22,13 @@
#REQUIRED_USER_KEY_CAPABILITY="a"
# Path to user-controlled authorized_keys file to add to
-# Monkeysphere-generated authorized_keys file. If empty, then no
-# user-controlled file will be added.
+# Monkeysphere-generated authorized_keys file.
+# To not add any user-controlled file, put "-"
#USER_CONTROLLED_AUTHORIZED_KEYS=~/.ssh/authorized_keys
# User known_hosts file
#USER_KNOWN_HOSTS=~/.ssh/known_hosts
-# Whether or not to hash the generated known_hosts lines
-# (empty mean "no").
-#HASH_KNOWN_HOSTS=
-
+# Whether or not to hash the generated known_hosts lines.
+# Should be "true" or "false"
+#HASH_KNOWN_HOSTS=true