aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2012-04-14 21:06:17 -0300
committerSilvio Rhatto <rhatto@riseup.net>2012-04-14 21:06:17 -0300
commitf0279c1629357a36f0f48f6e058ddd33328ff3bd (patch)
treef5d0edaab1971153d036e1379c9b84491dc50696
parent328cad06f7f49d842b356a941f3c1d7c3eeb94cd (diff)
downloadpuppet-nodo-f0279c1629357a36f0f48f6e058ddd33328ff3bd.tar.gz
puppet-nodo-f0279c1629357a36f0f48f6e058ddd33328ff3bd.tar.bz2
Do not make kvm inherit from physical
-rw-r--r--manifests/kvm.pp71
1 files changed, 70 insertions, 1 deletions
diff --git a/manifests/kvm.pp b/manifests/kvm.pp
index 09af17f..8d1b46a 100644
--- a/manifests/kvm.pp
+++ b/manifests/kvm.pp
@@ -1,4 +1,73 @@
-class nodo::kvm inherits nodo::physical {
+class nodo::kvm inherits nodo {
+ include syslog-ng
+ include initramfs
+ include modprobe
+ include firewire
+ include sysctl
+ include ups
+ include utils::physical
+ include smartmontools
+ include resolver
+ include monkeysphere_nodo
+
+ # SSL computational DoS mitigation
+ # See http://vincent.bernat.im/en/blog/2011-ssl-dos-mitigation.html
+ $firewall_ssl_ratelimit = $firewall_ssl_ratelimit ? {
+ '' => $firewall_global_ssl_ratelimit ? {
+ '' => '-',
+ default => $firewall_global_ssl_ratelimit,
+ },
+ default => $firewall_ssl_ratelimit,
+ }
+
+ # Firewall configuration
+ include firewall
+
+ # Vserver configuration
+ $vserver_vdirbase = "/var/vservers"
+ include vserver::host
+
+ if $use_nagios != false {
+ if $use_nagios_fqdn == true {
+ include nagios::target::fqdn
+ }
+ else {
+ include nagios::target
+ }
+ nagios::service::ping { "$fqdn": }
+ }
+
+ # Time configuration
+ case $ntpdate {
+ false: { include timezone }
+ default: { include ntpdate }
+ }
+
+ # SSH Server
+ #
+ # We need to restrict listen address so multiple instances
+ # can live together in the same physical host.
+ #
+ case $sshd_listen_address {
+ '': { $sshd_listen_address = [ "$ipaddress" ] }
+ }
+ include sshd
+
+ backupninja::sys { "sys":
+ ensure => present,
+ }
+
+ # Munin configuration
+ munin_node { "$hostname":
+ port => '4900',
+ }
+
+ # Removable media folder
+ file { [ "/media/usb", "/media/cdrom" ]:
+ ensure => directory,
+ mode => 0755,
+ }
+
# fstab
file { "/etc/fstab":
source => "puppet://$server/modules/nodo/etc/fstab/kvm",