From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 14 Apr 2013 18:24:11 +0000 (-0300)
Subject: Comments; declaring 'users:admin' only if it is defined
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=525016eaeca44b5e112d78a25e2cd74a6e40cc61;p=puppet-nodo.git

Comments; declaring 'users:admin' only if it is defined
---

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':