Remove acpid and acpi-support base on jessie machines.

[dsa-puppet.git] / modules / acpi / manifests / init.pp

diff --git a/modules/acpi/manifests/init.pp b/modules/acpi/manifests/init.pp
index ffc779b8dd106427c84ed58a991760e9e2240f0c..598cd16324df84f0ee21e6b2f6cd7dc1284d9536 100644 (file)
--- a/modules/acpi/manifests/init.pp
+++ b/modules/acpi/manifests/init.pp
@@ -1,13 +1,25 @@
 class acpi {
-    if ! ($::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386']) {
-        package {
-            acpid: ensure => installed
-        }
+       if ! ($::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386']) {
+               if ($::lsbmajdistrelease >= 8) {
+                       package { 'acpid':
+                               ensure => purged
+                       }
 
-        if $lsbdistcodename != 'lenny' {
-            package {
-                acpi-support-base: ensure => installed
-            }
-        }
-    }
+                       package { 'acpi-support-base':
+                               ensure => purged
+                       }
+               } else {
+                       package { 'acpid':
+                               ensure => installed
+                       }
+
+                       service { 'acpid':
+                               ensure  => running,
+                               require => Package['acpid'],
+                       }
+
+                       package { 'acpi-support-base':
+                               ensure => installed
+                       }
+       }
 }