From a8ed6675632af316c2eb7223088e12da3e4ee129 Mon Sep 17 00:00:00 2001 From: Antoine Beaupré Date: Wed, 6 Nov 2013 16:58:24 -0500 Subject: RAW_AUTHORIZED_KEYS support --- manifests/init.pp | 4 ++++ templates/monkeysphere.conf.erb | 2 ++ 2 files changed, 6 insertions(+) diff --git a/manifests/init.pp b/manifests/init.pp index 30035be..b360098 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -24,6 +24,10 @@ class monkeysphere( $ssh_port = '', $publish_key = false, $ensure_version = 'installed', + # if not false, will override the path for MONKEYSPHERE_RAW_AUTHORIZED_KEYS + # use 'none' to disable appending the authorized_keys file + # see monkeysphere-authentication for more information + $raw_authorized_keys = false, $keyserver = 'pool.sks-keyservers.net' ) { # The needed packages diff --git a/templates/monkeysphere.conf.erb b/templates/monkeysphere.conf.erb index 53e4b9e..f7988b8 100644 --- a/templates/monkeysphere.conf.erb +++ b/templates/monkeysphere.conf.erb @@ -37,3 +37,5 @@ # The path to the SSH authorized_keys file. #AUTHORIZED_KEYS=~/.ssh/authorized_keys + +<% if @raw_authorized_keys %>RAW_AUTHORIZED_KEYS=<%= @raw_authorized_keys %><% end %> -- cgit v1.2.3