Removing minimal nodo classes

diff --git a/manifests/desktop.pp b/manifests/desktop.pp
index 3cbe00162fed235530343bd806ee227da2342382..50524d6bb4af2015fcdc1215f56a6e074238fec3 100644 (file)
--- a/manifests/desktop.pp
+++ b/manifests/desktop.pp
@@ -10,16 +10,6 @@ class nodo::desktop inherits nodo::personal {
   }
 }
 
-class nodo::desktop::minimal {
-  $pam      = false
-
-  # Backups should happen when the box is likely to be online
-  $backup_when = 'everyday at 12:00'
-
-  # Desktop class
-  include nodo::desktop
-}
-
 class nodo::desktop::webdev inherits nodo::desktop {
   include websites::dev
   include database

diff --git a/manifests/laptop.pp b/manifests/laptop.pp
index f184801e1d138ec3a5980430008c3be0481e8d2c..96b5f0f32bfc314343d210fd44d3a18476b8b6cb 100644 (file)
--- a/manifests/laptop.pp
+++ b/manifests/laptop.pp
@@ -44,15 +44,3 @@ class nodo::laptop::webdev inherits nodo::laptop {
   include database
   include utils::web
 }
-
-class nodo::laptop::minimal {
-  $fstab    = false
-  $crypttab = false
-  $pam      = false
-
-  # Backups should happen when the box is likely to be online
-  $backup_when = 'everyday at 12:00'
-
-  # Desktop class
-  include nodo::laptop
-}

diff --git a/manifests/nodo.pp b/manifests/nodo.pp
index 8d746d0690878f79502673d92d879b93f49298c4..f0a6b219062e8e5d8a4c63deed215e3bd96c2113 100644 (file)
--- a/manifests/nodo.pp
+++ b/manifests/nodo.pp
@@ -1,7 +1,6 @@
 class nodo {
   include lsb
   include puppetd
-  include backup
   include sudo
   include users::admin
   include motd
@@ -14,6 +13,8 @@ class nodo {
   include domain
   include concat::setup
 
+  class { 'backup': }
+
   # Does not work well inside vservers
   class { 'runit': ensure => absent }
 

diff --git a/manifests/subsystems/pam.pp b/manifests/subsystems/pam.pp
index d2e15592903a3cc62a42cacbe59e25978c83675b..62b9e22b018c5368f29a8020ef963b4fb9799f4f 100644 (file)
--- a/manifests/subsystems/pam.pp
+++ b/manifests/subsystems/pam.pp
@@ -1,5 +1,7 @@
-class pam {
-  if $pam != false {
+class pam(
+  $enable = hiera('nodo::pam::enable', false)
+) {
+  if $enable != false {
     # pam - login
     file { "/etc/pam.d/login":
       source  => [ "puppet:///modules/nodo/etc/pam.d/login.${::lsbdistcodename}",