Adds nodo::subsystem::hibernate

diff --git a/manifests/base/laptop.pp b/manifests/base/laptop.pp
index 3eeb4173fd17b2646752241c5fea64e66aed0f46..7da2163a3ea9e000306067a089626a4a5548e789 100644 (file)
--- a/manifests/base/laptop.pp
+++ b/manifests/base/laptop.pp
@@ -1,47 +1,10 @@
 class nodo::base::laptop inherits nodo::base::personal {
-  include nodo::utils::laptop
   include nodo::subsystem::dhclient
+  include nodo::subsystem::hibernate
+  include nodo::utils::laptop
   include firewall::wifi
-  include firewall::openvpn
-
-  class { 'firewall::ppp': }
-
-  $hibernate = hiera('nodo::laptop::hibernate', false)
-
-  # Hibernation
-  file { "/etc/initramfs-tools/conf.d/resume":
-    owner     => "root",
-    group     => "root",
-    mode      => 0644,
-    content   => "RESUME=/dev/mapper/swap\n",
-    notify    => Exec['update-initramfs'],
-    ensure    => $hibernate ? {
-      false   => absent,
-      default => present,
-    },
-  }
-
-  file { "/etc/uswsusp.conf":
-    owner     => "root",
-    group     => "root",
-    mode      => 0644,
-    source    => 'puppet:///modules/nodo/etc/uswsusp.conf',
-    require   => Package['uswsusp'],
-    ensure    => $hibernate ? {
-      false   => absent,
-      default => present,
-    },
-  }
 
-  file { "/etc/pm/config.d/00sleep_module":
-    owner     => "root",
-    group     => "root",
-    mode      => 0644,
-    content   => "SLEEP_MODULE=\"uswsusp\"\n",
-    require   => Package['uswsusp'],
-    ensure    => $hibernate ? {
-      false   => absent,
-      default => present,
-    },
-  }
+  # Optional
+  #include firewall::openvpn
+  #include firewall::ppp
 }

diff --git a/manifests/subsystem/hibernate.pp b/manifests/subsystem/hibernate.pp
new file mode 100644 (file)
index 0000000..a036519
--- /dev/null
+++ b/manifests/subsystem/hibernate.pp
@@ -0,0 +1,46 @@
+class nodo::subsystem::hibernate(
+  $enable = false,
+) {
+  package { 'uswsusp':
+    ensure    => $enable ? {
+      false   => absent,
+      default => present,
+    },
+  }
+
+  file { "/etc/initramfs-tools/conf.d/resume":
+    owner     => "root",
+    group     => "root",
+    mode      => 0644,
+    content   => "RESUME=/dev/mapper/swap\n",
+    notify    => Exec['update-initramfs'],
+    ensure    => $enable ? {
+      false   => absent,
+      default => present,
+    },
+  }
+
+  file { "/etc/uswsusp.conf":
+    owner     => "root",
+    group     => "root",
+    mode      => 0644,
+    source    => 'puppet:///modules/nodo/etc/uswsusp.conf',
+    require   => Package['uswsusp'],
+    ensure    => $enable ? {
+      false   => absent,
+      default => present,
+    },
+  }
+
+  file { "/etc/pm/config.d/00sleep_module":
+    owner     => "root",
+    group     => "root",
+    mode      => 0644,
+    content   => "SLEEP_MODULE=\"uswsusp\"\n",
+    require   => Package['uswsusp'],
+    ensure    => $enable ? {
+      false   => absent,
+      default => present,
+    },
+  }
+}