Merge branch 'koumbit-sarava' into 'master' HEADmaster

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

1 files changed, 4 insertions, 6 deletions

diff --git a/manifests/sshserver.pp b/manifests/sshserver.pp
index 43c0f6f..a525b55 100644
--- a/manifests/sshserver.pp
+++ b/manifests/sshserver.pp
@@ -10,12 +10,10 @@ class monkeysphere::sshserver {
     }
   }
 
-  file{'/etc/cron.d/update-monkeysphere-auth':
-    ensure  => present,
-    source  => 'puppet:///modules/monkeysphere/etc/cron.d/update-monkeysphere-auth',
+  cron {'update-monkeysphere-auth':
+    command => '/usr/sbin/monkeysphere-authentication update-users > /dev/null 2>&1',
+    user    => root,
+    minute  => fqdn_rand(60),
     require => Package['monkeysphere'],
-    mode    => '0644',
-    owner   => root,
-    group   => root,
   }
 }