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.

1 files changed, 4 insertions, 39 deletions

diff --git a/manifests/utils.pp b/manifests/utils.pp
index 8f572b6..0335bf3 100644
--- a/manifests/utils.pp
+++ b/manifests/utils.pp
@@ -1,9 +1,6 @@
 # Common utilities
-class nodo::utils {
-  package { [ 'screen',    'less',   'bzip2', 'openssl', 'lynx',         'unzip',
-              'nmap',      'telnet', 'tree',  'whois',   'dosfstools',   'dnsutils',     'secure-delete',
-              'bc',        'lsof',   'wipe',  'vrms',    'nsca-client',  'uuid-runtime', 'vim-nox',
-              'multitail', 'bash-completion', 'zsh' ]:
+class nodo::utils inherits nodo::utils::base {
+  package { [ 'vim-nox' ]:
     ensure => installed,
   }
 
@@ -14,33 +11,11 @@ class nodo::utils {
     }
   }
 
-  # Not using right now
-  package { [ 'logcheck', 'logcheck-database' ]:
-    ensure => absent,
-  }
-
-  # We'll probably use https://github.com/puppetlabs/puppetlabs-denyhosts in the future
-  package { 'denyhosts':
-    ensure => purged,
-  }
-
-  # Maybe we use logwatch in the future
-  #package { 'logwatch':
-  #  ensure => installed,
-  #}
-
   # To be considered
   #package { 'needrestart':
   #  ensure  => present,
   #}
 
-  # Obsolete
-  if !defined(Package['git-core']) {
-    package { 'git-core':
-      ensure => absent,
-    }
-  }
-
   if !defined(Package['git']) {
     package { 'git':
       ensure => latest,
@@ -55,17 +30,7 @@ class nodo::utils {
   }
 
   # Ensure we have the minimum augeas version required by shorewall module
-  package {
-    'libaugeas0':
-      ensure => $::lsbdistcodename ? {
-        'squeeze' => '0.10.0-1~bpo60+3',
-        default   => installed,
-      };
-    'augeas-tools':
-      ensure => $::lsbdistcodename ? {
-        'squeeze' => '0.10.0-1~bpo60+3',
-        default   => installed,
-      },
-     require => Package['libaugeas0'];
+  package { [ 'libaugeas0', 'augeas-tools' ]:
+    ensure  => present,
   }
 }