aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-01-24 16:23:19 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-01-24 16:23:19 -0200
commitc64fae356ed57c48b0774bd43d8118fced0cb96a (patch)
tree9becf7c56ab8fcebc8b3ab61c18c6b66e411190a
parent1c2fb29bea38ccf12adf4fe8fd93fef44245eda0 (diff)
downloadpuppet-nodo-c64fae356ed57c48b0774bd43d8118fced0cb96a.tar.gz
puppet-nodo-c64fae356ed57c48b0774bd43d8118fced0cb96a.tar.bz2
Removing minimal nodo classes
-rw-r--r--manifests/desktop.pp10
-rw-r--r--manifests/laptop.pp12
-rw-r--r--manifests/nodo.pp3
-rw-r--r--manifests/subsystems/pam.pp6
4 files changed, 6 insertions, 25 deletions
diff --git a/manifests/desktop.pp b/manifests/desktop.pp
index 3cbe001..50524d6 100644
--- 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 f184801..96b5f0f 100644
--- 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 8d746d0..f0a6b21 100644
--- 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 d2e1559..62b9e22 100644
--- 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}",