aboutsummaryrefslogtreecommitdiff
path: root/manifests/base.pp
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-02-08 03:36:43 -0200
committerSilvio Rhatto <rhatto@riseup.net>2016-02-08 03:36:43 -0200
commita9c544369f3999b868cfc1eb0dcb10e050defcc1 (patch)
tree2f06ad6d179f2677368b2ec7d0932d5aaa0ad2ea /manifests/base.pp
parent6097bca6f5302765007f65a52f87999dbaefcff9 (diff)
downloadpuppet-nodo-a9c544369f3999b868cfc1eb0dcb10e050defcc1.tar.gz
puppet-nodo-a9c544369f3999b868cfc1eb0dcb10e050defcc1.tar.bz2
Initial cleanup
Remove munin, fstab, crypttab, gdm and old subsystems. This major change is motivated by the fact that the configuration has grown too much along the years and is difficult to maintain. Simplification is then necessary to keep going.
Diffstat (limited to 'manifests/base.pp')
-rw-r--r--manifests/base.pp29
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 }
}