aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-01-25 16:22:27 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-01-25 16:22:27 -0200
commit16f29cb1d81136fa0a65730c2847327c3a828508 (patch)
tree1865edf7a2c214a3efc9c31d7a5a98404cec2a5e
parentc9fe18855805193068a55f160f4695b09f452789 (diff)
downloadpuppet-nodo-16f29cb1d81136fa0a65730c2847327c3a828508.tar.gz
puppet-nodo-16f29cb1d81136fa0a65730c2847327c3a828508.tar.bz2
Cleanup
-rw-r--r--manifests/appliance.pp2
-rw-r--r--manifests/dns.pp1
-rw-r--r--manifests/kvm.pp2
-rw-r--r--manifests/laptop.pp4
-rw-r--r--manifests/removable.pp2
-rw-r--r--manifests/server.pp2
-rw-r--r--manifests/storage.pp1
-rw-r--r--manifests/web.pp2
8 files changed, 3 insertions, 13 deletions
diff --git a/manifests/appliance.pp b/manifests/appliance.pp
index dfc0116..41a3660 100644
--- a/manifests/appliance.pp
+++ b/manifests/appliance.pp
@@ -1,12 +1,10 @@
class nodo::appliance inherits nodo::physical {
class { 'sysctl::appliance': }
- # fstab
class { 'fstab':
type => 'appliance',
}
- # crypttab
class { 'crypttab':
type => 'appliance',
}
diff --git a/manifests/dns.pp b/manifests/dns.pp
index bd9db5d..1f4a1e1 100644
--- a/manifests/dns.pp
+++ b/manifests/dns.pp
@@ -1,4 +1,3 @@
class nodo::dns inherits nodo::vserver {
- # Class for dns nodes
include bind
}
diff --git a/manifests/kvm.pp b/manifests/kvm.pp
index 293d753..7b3b313 100644
--- a/manifests/kvm.pp
+++ b/manifests/kvm.pp
@@ -1,10 +1,8 @@
class nodo::kvm inherits nodo::host {
- # fstab
class { 'fstab':
type => 'kvm',
}
- # crypttab
class { 'crypttab':
type => 'kvm',
}
diff --git a/manifests/laptop.pp b/manifests/laptop.pp
index 96b5f0f..84d7697 100644
--- a/manifests/laptop.pp
+++ b/manifests/laptop.pp
@@ -18,7 +18,7 @@ class nodo::laptop inherits nodo::personal {
},
}
- # hibernation
+ # Hibernation
file { "/etc/initramfs-tools/conf.d/resume":
owner => "root",
group => "root",
@@ -31,7 +31,7 @@ class nodo::laptop inherits nodo::personal {
},
}
- # upgrade from lenny
+ # Useful when upgrading from lenny
if $lsbdistcodename != 'lenny' {
file { "/etc/modprobe.d/madwifi":
ensure => absent,
diff --git a/manifests/removable.pp b/manifests/removable.pp
index 9b0a723..16f0157 100644
--- a/manifests/removable.pp
+++ b/manifests/removable.pp
@@ -1,10 +1,8 @@
class nodo::removable inherits nodo::desktop {
- # fstab
File["/etc/fstab"] {
source => "puppet:///modules/nodo/etc/fstab/removable",
}
- # crypttab
File["/etc/crypttab"] {
source => "puppet:///modules/nodo/etc/crypttab/removable",
}
diff --git a/manifests/server.pp b/manifests/server.pp
index 15e52ad..90bb2ae 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -1,10 +1,8 @@
class nodo::server inherits nodo::physical {
- # fstab
class { 'fstab':
type => 'server',
}
- # crypttab
class { 'crypttab':
type => 'server',
}
diff --git a/manifests/storage.pp b/manifests/storage.pp
index 5bb7e72..13cbdab 100644
--- a/manifests/storage.pp
+++ b/manifests/storage.pp
@@ -1,4 +1,3 @@
class nodo::storage inherits nodo::vserver {
- # Class for backup nodes
include utils::storage
}
diff --git a/manifests/web.pp b/manifests/web.pp
index e68e5d6..86aa996 100644
--- a/manifests/web.pp
+++ b/manifests/web.pp
@@ -1,5 +1,5 @@
class nodo::web inherits nodo::vserver {
- # Class for web nodes
+ # Classes for web nodes
include websites
include database
include users::virtual