diff options
| -rw-r--r-- | manifests/nodo.pp | 5 | ||||
| -rw-r--r-- | manifests/subsystems/hosts.pp | 14 |
2 files changed, 11 insertions, 8 deletions
diff --git a/manifests/nodo.pp b/manifests/nodo.pp index edce74c..ba27640 100644 --- a/manifests/nodo.pp +++ b/manifests/nodo.pp @@ -5,13 +5,14 @@ class nodo { include motd include utils include cron - include hosts include locales include tunnel include profile include domain include concat::setup + class { 'hosts': } + if !defined('puppetd') { class { 'puppetd': } } @@ -101,7 +102,7 @@ class nodo { shared_ip => hiera('nodo::sshd_shared_ip', 'yes'), tcp_forwarding => hiera('nodo::sshd_tcp_forwarding', 'yes'), hardened_ssl => hiera('nodo::sshd_hardened_ssl', 'yes'), - print_motd => hiera('nodo::sshd_print_motd', 'yes'), + print_motd => hiera('nodo::sshd_print_motd', 'no'), ports => hiera('nodo::sshd_ports', [ 22 ]), use_pam => hiera('nodo::sshd_use_pam', 'no'), } diff --git a/manifests/subsystems/hosts.pp b/manifests/subsystems/hosts.pp index e1833ea..9453853 100644 --- a/manifests/subsystems/hosts.pp +++ b/manifests/subsystems/hosts.pp @@ -1,21 +1,23 @@ -class hosts { +class hosts( + $custom = hiera('nodo::hosts::custom', false) +) { # Sometimes might be useful to manage the whole # hosts file, see http://projects.puppetlabs.com/issues/10704 - case $nodo_custom_hosts_file { + case $custom { true: { file { '/etc/hosts': ensure => present, owner => root, group => root, mode => 0640, - source => "puppet:///modules/site_nodo/hosts/$fqdn", + source => "puppet:///modules/site_nodo/hosts/${::fqdn}", } } default: { - host { "$hostname": + host { "${::hostname}": ensure => present, - ip => "$ipaddress", - host_aliases => [ "$fqdn" ], + ip => "${::ipaddress}", + host_aliases => [ "${::fqdn}" ], } host { "localhost": |