From 1177a1b036fc12efc37bba0bc7830d491d428e2a Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Sat, 13 Mar 2010 16:33:07 -0300 Subject: Adding nodo::physical and nodo::desktop --- files/etc/crypttab | 4 ---- files/etc/crypttab/desktop | 6 ++++++ files/etc/crypttab/server | 4 ++++ files/etc/fstab | 3 --- files/etc/fstab-vserver | 2 -- files/etc/fstab/desktop | 5 +++++ files/etc/fstab/server | 3 +++ files/etc/fstab/vserver | 2 ++ manifests/init.pp | 36 +++++++++++++++++++++++++++++------- 9 files changed, 49 insertions(+), 16 deletions(-) delete mode 100644 files/etc/crypttab create mode 100644 files/etc/crypttab/desktop create mode 100644 files/etc/crypttab/server delete mode 100644 files/etc/fstab delete mode 100644 files/etc/fstab-vserver create mode 100644 files/etc/fstab/desktop create mode 100644 files/etc/fstab/server create mode 100644 files/etc/fstab/vserver diff --git a/files/etc/crypttab b/files/etc/crypttab deleted file mode 100644 index 35f0521..0000000 --- a/files/etc/crypttab +++ /dev/null @@ -1,4 +0,0 @@ -# -root /dev/mapper/vg-root none luks,cipher=aes-cbc-essiv:sha256 -cswap /dev/sda1 /dev/random swap,cipher=aes-cbc-essiv:sha256 -vservers /dev/mapper/vg-vservers none luks,cipher=aes-cbc-essiv:sha256 diff --git a/files/etc/crypttab/desktop b/files/etc/crypttab/desktop new file mode 100644 index 0000000..55f2040 --- /dev/null +++ b/files/etc/crypttab/desktop @@ -0,0 +1,6 @@ +# +root /dev/mapper/vg-root none luks,cipher=aes-cbc-essiv:sha256 +home /dev/mapper/vg-home none luks,cipher=aes-cbc-essiv:sha256 +var /dev/mapper/vg-var none luks,cipher=aes-cbc-essiv:sha256 +vservers /dev/mapper/vg-vservers none luks,cipher=aes-cbc-essiv:sha256 +cswap /dev/sda1 /dev/random swap,cipher=aes-cbc-essiv:sha256 diff --git a/files/etc/crypttab/server b/files/etc/crypttab/server new file mode 100644 index 0000000..35f0521 --- /dev/null +++ b/files/etc/crypttab/server @@ -0,0 +1,4 @@ +# +root /dev/mapper/vg-root none luks,cipher=aes-cbc-essiv:sha256 +cswap /dev/sda1 /dev/random swap,cipher=aes-cbc-essiv:sha256 +vservers /dev/mapper/vg-vservers none luks,cipher=aes-cbc-essiv:sha256 diff --git a/files/etc/fstab b/files/etc/fstab deleted file mode 100644 index 0878617..0000000 --- a/files/etc/fstab +++ /dev/null @@ -1,3 +0,0 @@ -/dev/mapper/cswap none swap sw 0 0 -/dev/mapper/root / ext3 defaults,errors=remount-ro 0 1 -/dev/mapper/vservers /var/vservers ext3 defaults,errors=remount-ro 0 0 diff --git a/files/etc/fstab-vserver b/files/etc/fstab-vserver deleted file mode 100644 index 8b82d56..0000000 --- a/files/etc/fstab-vserver +++ /dev/null @@ -1,2 +0,0 @@ -none /proc proc defaults 0 0 -none /dev/pts devpts gid=5,mode=620 0 0 diff --git a/files/etc/fstab/desktop b/files/etc/fstab/desktop new file mode 100644 index 0000000..1da30de --- /dev/null +++ b/files/etc/fstab/desktop @@ -0,0 +1,5 @@ +/dev/mapper/cswap none swap sw 0 0 +/dev/mapper/root / ext3 defaults,errors=remount-ro 0 1 +/dev/mapper/home /home ext3 defaults,errors=remount-ro 0 0 +/dev/mapper/var /var ext3 defaults,errors=remount-ro 0 0 +/dev/mapper/vservers /var/vservers ext3 defaults,errors=remount-ro 0 0 diff --git a/files/etc/fstab/server b/files/etc/fstab/server new file mode 100644 index 0000000..0878617 --- /dev/null +++ b/files/etc/fstab/server @@ -0,0 +1,3 @@ +/dev/mapper/cswap none swap sw 0 0 +/dev/mapper/root / ext3 defaults,errors=remount-ro 0 1 +/dev/mapper/vservers /var/vservers ext3 defaults,errors=remount-ro 0 0 diff --git a/files/etc/fstab/vserver b/files/etc/fstab/vserver new file mode 100644 index 0000000..8b82d56 --- /dev/null +++ b/files/etc/fstab/vserver @@ -0,0 +1,2 @@ +none /proc proc defaults 0 0 +none /dev/pts devpts gid=5,mode=620 0 0 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, -- cgit v1.2.3