aboutsummaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorAntoine Beaupré <anarcat@koumbit.org>2013-11-18 23:35:20 -0500
committerAntoine Beaupré <anarcat@koumbit.org>2013-11-18 23:35:20 -0500
commit25116e419c6af78132b777af106bef8edfb2f962 (patch)
treed94c8a198880f7d2567d8e2061af1dbc0cff7603 /templates
parent70faa645fd9c0359c90a7a310d934dc7d8d493b7 (diff)
downloadpuppet-monkeysphere-25116e419c6af78132b777af106bef8edfb2f962.tar.gz
puppet-monkeysphere-25116e419c6af78132b777af106bef8edfb2f962.tar.bz2
RAW_AUTHORIZED_KEYS belongs in monkeysphere-authentication.conf, not monkeysphere.conf
Diffstat (limited to 'templates')
-rw-r--r--templates/monkeysphere-authentication.conf.erb3
-rw-r--r--templates/monkeysphere.conf.erb2
2 files changed, 3 insertions, 2 deletions
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 %>