From 52b8ad1ff1d6479e7b0cb6bea8ca7fb853f1b14c Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Fri, 11 Dec 2009 12:25:25 -0500
Subject: take the file definition out of the define, so that it can be
 properly referenced within the define itself

---
 manifests/init.pp | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index dd9d2e0..e7492ab 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,24 +1,28 @@
 class sysctl {
 
-  define config ($value, $comment) {
-    file { "sysctl_$name":
-      path => "/etc/sysctl.conf",
+    file { "/etc/sysctl.conf":
       mode => 644,
       owner => root,
       group => root,
       ensure => present,
     }
-    augeas { "sysctl_$name":
-      context => "/files/etc/sysctl.conf",
-      changes => [ "set $name $value", "insert #comment before $name",
-                   "set #comment[last()] '$comment'" ],
-      onlyif  => "get $name != $value",
-      notify  => Exec["sysctl_$name"],
-    }
-    exec { "sysctl_$name":
-      command => "/sbin/sysctl -p",
-      subscribe   => File["sysctl_$name"],
-      refreshonly => true,
-    }
+}
+
+define sysctl::config ($value, $comment) {
+
+  include sysctl
+
+  augeas { "sysctl_${name}":
+    context => "/files/etc/sysctl.conf",
+    changes => [ "set $name $value", "insert #comment before $name",
+                 "set #comment[last()] '$comment'" ],
+    onlyif  => "get $name != $value",
+    notify  => Exec["sysctl_${name}"],
+  }
+
+  exec { "sysctl_${name}":
+    command => "/sbin/sysctl -p",
+    subscribe   => File["/etc/sysctl.conf"],
+    refreshonly => true,
   }
 }
-- 
cgit v1.2.3