diff options
Diffstat (limited to 'manifests/base.pp')
| -rw-r--r-- | manifests/base.pp | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index 6426219..f0a05d7 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -7,7 +7,6 @@ class nodo::base( # Then include our subsystems include nodo::subsystem::sudo include nodo::subsystem::locales - include nodo::subsystem::profile include nodo::subsystem::screen include nodo::subsystem::screen::startup include nodo::subsystem::backup @@ -17,39 +16,25 @@ class nodo::base( include nodo::subsystem::local # Apt module - $apt = hiera('nodo::subsystem::apt', True) - if $apt == true { - include nodo::subsystem::apt - } + #$apt = hiera('nodo::subsystem::apt', True) + #if $apt == true { + # include nodo::subsystem::apt + #} # Declare subsystem classes - class { [ 'nodo::subsystem::hosts', 'nodo::subsystem::motd' ]: } + #class { 'nodo::subsystem::hosts': } + class { 'nodo::subsystem::motd': } # Common utilities include nodo::utils # Other modules - include tunnel::autossh - include domain_check include concat::setup include cron + include shellprompt # Require admin accounts' class if (defined(site_users::admin)) { include site_users::admin } - - # Puppet - case $puppet_mode { - 'standalone': { include puppet::standalone } - 'daemon': { - class { 'puppet::daemon': - master => hiera('nodo::role::master::main', false), - } - } - default: { } - } - - # Does not work well inside vservers - #class { 'runit': ensure => absent } } |