diff options
| author | Micah <micah@riseup.net> | 2015-10-09 20:21:58 +0000 |
|---|---|---|
| committer | Micah <micah@riseup.net> | 2015-10-09 20:21:58 +0000 |
| commit | ba81744a42548de60bb4f48c66a7e95cd050ad4a (patch) | |
| tree | 664fea7e838b553ba0864b8dc61cc5323251c4c1 /templates/authorized_user_ids.erb | |
| parent | f661c786095e99087773f01351cebe00837f68a7 (diff) | |
| parent | 39631404dc41f706ad665ad2770e9c48b98a98fa (diff) | |
| download | puppet-monkeysphere-master.tar.gz puppet-monkeysphere-master.tar.bz2 | |
merge the mayfirst, koumbit and sarava changes
the monkeysphere module in shared is very old (2 years 4 months)! since then, sarava and koumbit have done significant work to improve on the module.
mayfirst did changes to allow choosing a keyserver, added flexibility, user configs and so on.
sarava fixed some bugs.
koumbit merged both with the shared modules, did a style cleanup and autoloading, added RAW_AUTHORIZED_KEYS, silence some warnings and randomized cron jobs.
this still fails in puppet 3.x, but is an improvement over what's already present.
See merge request !1
Diffstat (limited to 'templates/authorized_user_ids.erb')
| -rw-r--r-- | templates/authorized_user_ids.erb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/templates/authorized_user_ids.erb b/templates/authorized_user_ids.erb new file mode 100644 index 0000000..9313c6b --- /dev/null +++ b/templates/authorized_user_ids.erb @@ -0,0 +1,6 @@ +# This file is maintained by puppet, changes will be overwritten +<% if user_ids.is_a? String -%> +<%= user_ids %> +<% elsif user_ids.is_a? Array -%> +<%= user_ids.map { |i| "#{i}" }.join("\n") %> +<% end -%> |