diff options
| author | Antoine Beaupré <anarcat@koumbit.org> | 2013-11-06 16:58:24 -0500 |
|---|---|---|
| committer | Antoine Beaupré <anarcat@koumbit.org> | 2013-11-06 16:58:24 -0500 |
| commit | a8ed6675632af316c2eb7223088e12da3e4ee129 (patch) | |
| tree | a06f67ab8da379f30dca41f2cd7219fea7a35b95 | |
| parent | db082697788659730e91aa34fa293b8cab7029d9 (diff) | |
| download | puppet-monkeysphere-a8ed6675632af316c2eb7223088e12da3e4ee129.tar.gz puppet-monkeysphere-a8ed6675632af316c2eb7223088e12da3e4ee129.tar.bz2 | |
RAW_AUTHORIZED_KEYS support
| -rw-r--r-- | manifests/init.pp | 4 | ||||
| -rw-r--r-- | templates/monkeysphere.conf.erb | 2 |
2 files changed, 6 insertions, 0 deletions
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 %> |