From: Antoine Beaupré <anarcat@koumbit.org>
Date: Tue, 19 Nov 2013 04:35:20 +0000 (-0500)
Subject: RAW_AUTHORIZED_KEYS belongs in monkeysphere-authentication.conf, not monkeysphere... 
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=25116e419c6af78132b777af106bef8edfb2f962;p=puppet-monkeysphere.git

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

diff --git a/templates/monkeysphere-authentication.conf.erb b/templates/monkeysphere-authentication.conf.erb
index 1b13cfd..a76e6b8 100644
--- 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 f7988b8..53e4b9e 100644
--- 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 %>