From 40a4dd3827395ce6f7c1cf6ee675a438430d3820 Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@mageia.org>
Date: Mon, 2 Apr 2012 11:05:27 +0000
Subject: split a module pubkeys_directory, so we can include it from
 symlink_user and make sure everything is correctly declared

---
 modules/openssh/manifests/pubkeys_directory.pp  | 17 +++++++++++++++++
 modules/openssh/manifests/ssh_keys_from_ldap.pp | 17 +----------------
 modules/openssh/manifests/symlink_user.pp       |  2 ++
 3 files changed, 20 insertions(+), 16 deletions(-)
 create mode 100644 modules/openssh/manifests/pubkeys_directory.pp

(limited to 'modules/openssh/manifests')

diff --git a/modules/openssh/manifests/pubkeys_directory.pp b/modules/openssh/manifests/pubkeys_directory.pp
new file mode 100644
index 00000000..cbcaeb88
--- /dev/null
+++ b/modules/openssh/manifests/pubkeys_directory.pp
@@ -0,0 +1,17 @@
+class openssh::pubkeys_directory {
+    $pubkeys_directory = '/var/lib/pubkeys'
+    file { $pubkeys_directory:
+        ensure => directory,
+    }
+
+    file { "$pubkeys_directory/root":
+        ensure => directory,
+        mode   => '0700',
+    }
+
+    file { "$pubkeys_directory/root/authorized_keys":
+        ensure => link,
+        target => '/root/.ssh/authorized_keys',
+        mode   => '0700',
+    }
+}
diff --git a/modules/openssh/manifests/ssh_keys_from_ldap.pp b/modules/openssh/manifests/ssh_keys_from_ldap.pp
index 720f4481..b466bab3 100644
--- a/modules/openssh/manifests/ssh_keys_from_ldap.pp
+++ b/modules/openssh/manifests/ssh_keys_from_ldap.pp
@@ -9,22 +9,7 @@ class openssh::ssh_keys_from_ldap($symlink_users = [],
 
     package { 'python-ldap': }
 
-    $pubkeys_directory = '/var/lib/pubkeys'
-    file { $pubkeys_directory:
-        ensure => directory,
-    }
-
-    file { "$pubkeys_directory/root":
-        ensure => directory,
-        mode   => '0700',
-    }
-
-    file { "$pubkeys_directory/root/authorized_keys":
-        ensure => link,
-        target => '/root/.ssh/authorized_keys',
-        mode   => '0700',
-    }
-
+    include openssh::pubkeys_directory
     symlink_user { $symlink_users: }
 
     $ldap_pwfile = '/etc/ldap.secret'
diff --git a/modules/openssh/manifests/symlink_user.pp b/modules/openssh/manifests/symlink_user.pp
index f4ec942f..f2e107b1 100644
--- a/modules/openssh/manifests/symlink_user.pp
+++ b/modules/openssh/manifests/symlink_user.pp
@@ -1,4 +1,6 @@
 define openssh::symlink_user() {
+    include openssh::pubkeys_directory
+    $pubkeys_directory = $openssh::pubkeys_directory::pubkeys_directory
     file { "$pubkeys_directory/$name":
         ensure => directory,
         owner  => $name,
-- 
cgit v1.2.1