RAW_AUTHORIZED_KEYS belongs in monkeysphere-authentication.conf, not monkeysphere...

diff --git a/templates/monkeysphere-authentication.conf.erb b/templates/monkeysphere-authentication.conf.erb
index 1b13cfd6e833e7a3e6c90c93dae9680d9ee66138..a76e6b855d3cac01f2682adbc79e27e2b0037a1c 100644 (file)
--- a/templates/monkeysphere-authentication.conf.erb
+++ b/templates/monkeysphere-authentication.conf.erb
@@ -32,3 +32,6 @@
 # username of the user.  Setting this variable to 'none' prevents the
 # inclusion of user controlled authorized_keys file.
 #RAW_AUTHORIZED_KEYS="%h/.ssh/authorized_keys"
+<% if @raw_authorized_keys -%>
+RAW_AUTHORIZED_KEYS=<%= @raw_authorized_keys -%>
+<% end -%>

diff --git a/templates/monkeysphere.conf.erb b/templates/monkeysphere.conf.erb
index f7988b86c70991307780e7669a3ad50d9abad7de..53e4b9efc68a8ea1a0449686942dce80f9a763bc 100644 (file)
--- a/templates/monkeysphere.conf.erb
+++ b/templates/monkeysphere.conf.erb
@@ -37,5 +37,3 @@
 
 # The path to the SSH authorized_keys file.
 #AUTHORIZED_KEYS=~/.ssh/authorized_keys
-
-<% if @raw_authorized_keys %>RAW_AUTHORIZED_KEYS=<%= @raw_authorized_keys %><% end %>