From a9c544369f3999b868cfc1eb0dcb10e050defcc1 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 8 Feb 2016 03:36:43 -0200
Subject: Initial cleanup

Remove munin, fstab, crypttab, gdm and old subsystems.

This major change is motivated by the fact that the configuration has
grown too much along the years and is difficult to maintain.
Simplification is then necessary to keep going.
---
 manifests/base/physical.pp | 55 ++--------------------------------------------
 1 file changed, 2 insertions(+), 53 deletions(-)

(limited to 'manifests/base/physical.pp')

diff --git a/manifests/base/physical.pp b/manifests/base/physical.pp
index 45648ee..a00dd18 100644
--- a/manifests/base/physical.pp
+++ b/manifests/base/physical.pp
@@ -1,58 +1,7 @@
 class nodo::base::physical inherits nodo::base::host {
   class { [ 'nodo::subsystem::ups', 'smartmontools' ]: }
 
-  # SMART and sensors monitoring
-  $munin = hiera('nodo::host::use_munin', True)
-  if $munin == true {
-    include munin::plugins::smart
-
-    # TODO: use nodo::physical::disks instead
-    $sdb   = hiera('nodo::physical::sdb', false)
-    $disks = $sdb ? {
-      true    => 'sda sdb',
-      default => 'sda',
-    }
-
-    munin::plugin { 'hddtemp_smartctl':
-      ensure => present,
-      config => "user root\ngroup disk\nenv.drives ${disks}",
-    }
-
-    munin::plugin { 'smart_sda':
-      ensure => 'smart_',
-      config => "user root\ngroup disk",
-    }
-
-    if $sdb == true {
-      munin::plugin { 'smart_sdb':
-        ensure => 'smart_',
-        config => "user root\ngroup disk",
-      }
-    }
-
-    package { 'lm-sensors':
-      ensure => present,
-    }
-
-    munin::plugin { [ 'sensors_fan', 'sensors_volt', 'sensors_temp' ]:
-      ensure => 'sensors_',
-    }
-  }
-
-  # Entropy key
-  $ekey_masterkey = hiera('nodo::physical::ekey_masterkey', '')
-  if $ekey_masterkey != '' {
-    class { "ekeyd":
-      ekeyd_masterkey => $ekey_masterkey,
-    }
-
-    # We can also use ekeyd::munin
-    munin::plugin { [ 'ekeyd_stat_KeyTemperatureC', 'ekeyd_stat_KeyTemperatureF',
-                      'ekeyd_stat_KeyTemperatureK', 'ekeyd_stat_TotalEntropy',
-                      'ekeyd_stat_KeyVoltage',      'ekeyd_stat_FipsFrameRate',
-                      'ekeyd_stat_EntropyRate',     'ekeyd_stat' ]:
-      ensure => 'ekeyd_stat_',
-      config => 'user root',
-    }
+  package { 'lm-sensors':
+    ensure => present,
   }
 }
-- 
cgit v1.2.3