aboutsummaryrefslogtreecommitdiff
path: root/manifests/nodo.pp
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/nodo.pp')
-rw-r--r--manifests/nodo.pp22
1 files changed, 11 insertions, 11 deletions
diff --git a/manifests/nodo.pp b/manifests/nodo.pp
index 5fe4ee1..97ef044 100644
--- a/manifests/nodo.pp
+++ b/manifests/nodo.pp
@@ -1,19 +1,19 @@
class nodo {
include lsb
- include sudo
+ include nodo::subsystem::sudo
+ include nodo::subsystem::motd
+ include nodo::subsystem::locales
+ include nodo::subsystem::profile
+ include nodo::utils
+ include tunnel::autossh
+ include domain_check
include users::admin
- include motd
- include utils
- include cron
- include locales
- include tunnel
- include profile
- include domain
include concat::setup
+ include cron
- class { 'hosts': }
+ class { 'nodo::subsystem::hosts': }
- # then include puppet class
+ # Include if not defined by nodo::master
if !defined('puppet::daemon') {
class { 'puppet::daemon': }
}
@@ -51,7 +51,7 @@ class nodo {
case $mail_delivery {
'tunnel': {
$mail_hostname = hiera('nodo::mail_hostname')
- tunnel::mail { "$mail_hostname":
+ tunnel::autossh::mail { "$mail_hostname":
sshport => hiera('nodo::mail_ssh_port'),
}
}