diff options
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/init.pp | 36 |
1 files changed, 29 insertions, 7 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 8133e45..ccf94d4 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -110,7 +110,7 @@ class nodo { } } -class nodo::server inherits nodo { +class nodo::physical inherits nodo { include syslog-ng include firewall include vserver::host @@ -144,9 +144,16 @@ class nodo::server inherits nodo { ensure => present, } + # Munin configuration + munin_node { "$hostname": + port => '4900', + } +} + +class nodo::server inherits nodo::physical { # fstab file { "/etc/fstab": - source => "puppet://$server/modules/nodo/etc/fstab", + source => "puppet://$server/modules/nodo/etc/fstab/server", owner => "root", group => "root", mode => 0644, @@ -155,16 +162,31 @@ class nodo::server inherits nodo { # crypttab file { "/etc/crypttab": - source => "puppet://$server/modules/nodo/etc/crypttab", + source => "puppet://$server/modules/nodo/etc/crypttab/server", owner => "root", group => "root", mode => 0644, ensure => present, } +} - # Munin configuration - munin_node { "$hostname": - port => '4900', +class nodo::desktop inherits nodo::physical { + # fstab + file { "/etc/fstab": + source => "puppet://$desktop/modules/nodo/etc/fstab/desktop", + owner => "root", + group => "root", + mode => 0644, + ensure => present, + } + + # crypttab + file { "/etc/crypttab": + source => "puppet://$desktop/modules/nodo/etc/crypttab/desktop", + owner => "root", + group => "root", + mode => 0644, + ensure => present, } } @@ -221,7 +243,7 @@ class nodo::vserver inherits nodo { # Some nodes need a lot of space at /tmp otherwise some admin # tasks like backups might not run. file { "/etc/vservers/${name}/fstab": - source => "puppet://$server/modules/nodo/etc/fstab-vserver", + source => "puppet://$server/modules/nodo/etc/fstab/vserver", owner => "root", group => "root", mode => 0644, |