aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-04-14 15:24:11 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-04-14 15:24:11 -0300
commit525016eaeca44b5e112d78a25e2cd74a6e40cc61 (patch)
tree1ec52b4890e250121d780b96b190d779f16468f3
parentccf767482ffb2993f957b47c9d92b7181b5c39b6 (diff)
downloadpuppet-nodo-525016eaeca44b5e112d78a25e2cd74a6e40cc61.tar.gz
puppet-nodo-525016eaeca44b5e112d78a25e2cd74a6e40cc61.tar.bz2
Comments; declaring 'users:admin' only if it is defined
-rw-r--r--manifests/base.pp16
1 files changed, 14 insertions, 2 deletions
diff --git a/manifests/base.pp b/manifests/base.pp
index 66035eb..12d7171 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -1,5 +1,8 @@
class nodo::base {
+ # First include the LSB class
include lsb
+
+ # Then include our subsystems
include nodo::subsystem::sudo
include nodo::subsystem::locales
include nodo::subsystem::profile
@@ -9,14 +12,23 @@ class nodo::base {
include nodo::subsystem::sshd
include nodo::subsystem::hostname
include nodo::subsystem::local
+
+ # Declare subsystem classes
+ class { [ 'nodo::subsystem::hosts', 'nodo::subsystem::motd' ]: }
+
+ # Common utilities
include nodo::utils
+
+ # Other modules
include tunnel::autossh
include domain_check
- include users::admin
include concat::setup
include cron
- class { [ 'nodo::subsystem::hosts', 'nodo::subsystem::motd' ]: }
+ # Include admin accounts if you have this class
+ if defined('users:admin') {
+ include users::admin
+ }
# Puppet daemon
class { 'puppet::daemon':