From f661c786095e99087773f01351cebe00837f68a7 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Wed, 2 Jan 2013 21:13:41 +0100
Subject: cleanup the merge

---
 manifests/sshserverdanger.pp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'manifests/sshserverdanger.pp')

diff --git a/manifests/sshserverdanger.pp b/manifests/sshserverdanger.pp
index 7d7f12c..7ae6970 100644
--- a/manifests/sshserverdanger.pp
+++ b/manifests/sshserverdanger.pp
@@ -1,11 +1,11 @@
-class monkeysphere::sshserverdanger  inherits monkeysphere::sshserver 
-{
-  augeas { "sshd_config":
-    context => "/files/etc/ssh/sshd_config",
-    changes => [
-                "set AuthorizedKeysFile /var/lib/monkeysphere/authorized_keys/%u"
-                ],
-    notify => Service[ "ssh" ],
+# use this to authenticate with monkeysphere on ssh
+# you should not manage the sshd config as a whole
+# or at least put there the same key.
+class monkeysphere::sshserverdanger {
+  include monkeysphere::sshserver
+  augeas{'sshd_config':
+    context => '/files/etc/ssh/sshd_config',
+    changes => [ 'set AuthorizedKeysFile /var/lib/monkeysphere/authorized_keys/%u' ],
+    notify  => Service['ssh'],
   }
-
 }
-- 
cgit v1.2.3