diff options
| -rw-r--r-- | manifests/host.pp | 5 | ||||
| -rw-r--r-- | manifests/nodo.pp | 9 | ||||
| -rw-r--r-- | manifests/plug.pp | 3 | ||||
| -rw-r--r-- | manifests/vserver.pp | 3 |
4 files changed, 5 insertions, 15 deletions
diff --git a/manifests/host.pp b/manifests/host.pp index 42e739d..88e9005 100644 --- a/manifests/host.pp +++ b/manifests/host.pp @@ -27,9 +27,10 @@ class nodo::host inherits nodo { } # Time configuration + $ntpdate = hiera('nodo::host::ntpdate', True) case $ntpdate { - false: { include timezone } - default: { include ntpdate } + false: { class { 'timezone': } } + default: { class { 'ntpdate': } } } backupninja::sys { "sys": diff --git a/manifests/nodo.pp b/manifests/nodo.pp index 67d8f7c..edce74c 100644 --- a/manifests/nodo.pp +++ b/manifests/nodo.pp @@ -44,15 +44,6 @@ class nodo { # Does not work well inside vservers class { 'runit': ensure => absent } - # Set timezone and ntp config - # - # We config those here but leave class inclusion elsewhere - # as ntp config differ from server to vserver. - # - $ntp_timezone = "Brazil/East" - $ntp_pool = "south-america.pool.ntp.org" - $ntp_servers = [ 'a.ntp.br', 'b.ntp.br', 'c.ntp.br' ] - # Email delivery configuration case hiera('nodo::mail_delivery', 'exim') { 'tunnel': { diff --git a/manifests/plug.pp b/manifests/plug.pp index f5992fc..08bb4c9 100644 --- a/manifests/plug.pp +++ b/manifests/plug.pp @@ -1,5 +1,4 @@ class nodo::plug inherits nodo { - include ntpdate include syslog-ng include utils::plug include sysctl @@ -7,7 +6,7 @@ class nodo::plug inherits nodo { monkeysphere_host { "${::hostname}": } - class { 'firewall': } + class { [ 'ntpdate', 'firewall' ]: } backupninja::sys { "sys": ensure => present, diff --git a/manifests/vserver.pp b/manifests/vserver.pp index a889e9a..6854aba 100644 --- a/manifests/vserver.pp +++ b/manifests/vserver.pp @@ -1,6 +1,5 @@ class nodo::vserver inherits nodo { - include timezone - + class { 'timezone': } class { 'syslog-ng::vserver': } backupninja::sys { "sys": |