From ad27f5dac1870369abe10e88fbb034ffa391f12c Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 24 Jan 2013 13:18:39 -0200
Subject: Lots of subsystem refactoring; minor node changes

---
 manifests/subsystems/sysctl.pp | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'manifests/subsystems/sysctl.pp')

diff --git a/manifests/subsystems/sysctl.pp b/manifests/subsystems/sysctl.pp
index 5e6dec7..d78a0f7 100644
--- a/manifests/subsystems/sysctl.pp
+++ b/manifests/subsystems/sysctl.pp
@@ -30,10 +30,10 @@ class sysctl {
     group   => "root",
     mode    => 0644,
     ensure  => present,
-    content => "kernel.printk = $printk_levels\n",
+    content => "kernel.printk = ${printk_levels}\n",
   }
 
-  exec { "/bin/echo '$printk_levels' > /proc/sys/kernel/printk":
+  exec { "/bin/echo '${printk_levels}' > /proc/sys/kernel/printk":
     subscribe   => File["/etc/sysctl.d/kernel.printk.conf"],
     refreshonly => true,
   }
@@ -44,28 +44,24 @@ class sysctl::laptop {
     owner   => "root",
     group   => "root",
     mode    => 0644,
-    source  => "puppet://$server/modules/nodo/etc/sysctl.d/madwifi.conf",
-    ensure  => $lsbdistcodename ? {
+    source  => "puppet:///modules/nodo/etc/sysctl.d/madwifi.conf",
+    ensure  => $::lsbdistcodename ? {
       'lenny' => present,
       default => absent,
     },
   }
 }
 
-class sysctl::appliance {
-  case $kernel_panic {
-    '': { $kernel_panic = "20" }
-  }
-
+class sysctl::appliance($kernel_panic = hiera('nodo::sysctl::appliance', '20') {
   file { "/etc/sysctl.d/kernel.panic.conf":
     owner   => "root",
     group   => "root",
     mode    => 0644,
     ensure  => present,
-    content => "kernel.panic = $kernel_panic\n",
+    content => "kernel.panic = ${kernel_panic}\n",
   }
 
-  exec { "/bin/echo '$kernel_panic' > /proc/sys/kernel/panic":
+  exec { "/bin/echo '${kernel_panic}' > /proc/sys/kernel/panic":
     subscribe   => File["/etc/sysctl.d/kernel.panic.conf"],
     refreshonly => true,
   }
-- 
cgit v1.2.3