diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2013-04-12 17:09:03 -0300 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2013-04-12 17:09:03 -0300 |
commit | fe1c86b8f938283e9dd8196a8b11a9648f4b49e6 (patch) | |
tree | c2d999eca03862a3e4af57e0885397adf6bbc6ec /manifests/nodo.pp | |
parent | ec5c750d12bdc7948bb3c04f0c72817718a0bf47 (diff) | |
download | puppet-nodo-fe1c86b8f938283e9dd8196a8b11a9648f4b49e6.tar.gz puppet-nodo-fe1c86b8f938283e9dd8196a8b11a9648f4b49e6.tar.bz2 |
Major refactor
Diffstat (limited to 'manifests/nodo.pp')
-rw-r--r-- | manifests/nodo.pp | 22 |
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'), } } |