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 /lib | |
| 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 'lib')
| -rw-r--r-- | lib/facter/monkeysphere.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/facter/monkeysphere.rb b/lib/facter/monkeysphere.rb index 1d7d68e..6f48a4d 100644 --- a/lib/facter/monkeysphere.rb +++ b/lib/facter/monkeysphere.rb @@ -5,7 +5,7 @@ ssh_fingerprint = ' ' if File.exist?('/usr/sbin/monkeysphere-host') - sk = %x{/usr/sbin/monkeysphere-host show-keys} + sk = %x{/usr/sbin/monkeysphere-host show-keys 2>/dev/null} if $? == 0 has_hostkey = true sk.lines.each do |line| |