Adding modprobe class and, new packages on utils::personal

diff --git a/files/etc/modprobe.d/blacklist b/files/etc/modprobe.d/blacklist
index 1505e864909b2847f22197d32e43e8d2ce360aca..3d8df3a0bc87a0ce14d5859ab454dc32faf940fd 100644 (file)
--- a/files/etc/modprobe.d/blacklist
+++ b/files/etc/modprobe.d/blacklist
@@ -76,3 +76,6 @@ blacklist ohci1394
 install ohci1394 false
 # Iff we should ever load the ohci1394 module, force the use of the 'phys_dma=0' option.
 options ohci1394 phys_dma=0
+
+# PC Speaker
+blacklist pcspkr

diff --git a/manifests/init.pp b/manifests/init.pp
index 1f72ac1ff77b9496ab5f453e7a8ea47a8aaf0d75..0e42f43960ae24b363b767d2c4b158d37bd5fdbc 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -17,6 +17,7 @@ import "subsystems/websites.pp"
 import "subsystems/munin.pp"
 import "subsystems/pam.pp"
 import "subsystems/xorg.pp"
+import "subsystems/modprobe.pp"
 
 # Import nodo classes
 import "nodo.pp"

diff --git a/manifests/physical.pp b/manifests/physical.pp
index 6422970948abc48cde7fedc437f560c95b5243f1..51fd155d2e0e95669cc4ba6a15f4938b9aa4ca1d 100644 (file)
--- a/manifests/physical.pp
+++ b/manifests/physical.pp
@@ -3,6 +3,7 @@ class nodo::physical inherits nodo {
   include firewall
   include vserver::host
   include initramfs
+  include modprobe
   include firewire
   include sysctl
   include ups

diff --git a/manifests/subsystems/firewire.pp b/manifests/subsystems/firewire.pp
index 1c9609a675a713bbd046d6cc088c631f320f1a2b..088e194e374150f0189e57dc9f1dc97d3634a700 100644 (file)
--- a/manifests/subsystems/firewire.pp
+++ b/manifests/subsystems/firewire.pp
@@ -1,15 +1,7 @@
 class firewire {
-  # keep firewire disabled
-  # see http://padrao.sarava.org/trac/wiki/Debian/Firewire
-  file { "/etc/modprobe.d/blacklist":
-    owner   => "root",
-    group   => "root",
-    mode    => 0644,
-    ensure  => present,
-    source  => "puppet://$server/modules/nodo/etc/modprobe.d/blacklist",
-  }
-
   # make sure ohci1394 is not loaded
+  # see http://padrao.sarava.org/trac/wiki/Debian/Firewire
+  # see also the modprobe class
   exec { "rmmod ohci1394":
     unless  => "/bin/sh -c 'if `grep -q ^ohci1394 /proc/modules`; then false; else true; fi'",
     user    => "root",

diff --git a/manifests/subsystems/modprobe.pp b/manifests/subsystems/modprobe.pp
new file mode 100644 (file)
index 0000000..6192f6d
--- /dev/null
+++ b/manifests/subsystems/modprobe.pp
@@ -0,0 +1,10 @@
+class modprobe {
+  # keep firewire disabled among other things
+  file { "/etc/modprobe.d/blacklist":
+    owner   => "root",
+    group   => "root",
+    mode    => 0644,
+    ensure  => present,
+    source  => "puppet://$server/modules/nodo/etc/modprobe.d/blacklist",
+  }
+}

diff --git a/manifests/subsystems/utils.pp b/manifests/subsystems/utils.pp
index 4b66e24217f7d794eca2f063d6d2bf5f090bfdf0..67006b650a819b8198be3551af91d658ff39197e 100644 (file)
--- a/manifests/subsystems/utils.pp
+++ b/manifests/subsystems/utils.pp
@@ -46,7 +46,8 @@ class utils::personal {
               'audacious',         'qjackctl',                'bittorrent',
               'subversion',        'fortunes-br',             'xine-ui',
               'broffice.org',      'mozilla-firefox-adblock', 'cups-client',
-              'amarok',            'mc' ]:
+              'amarok',            'mc',                      'wodim',
+              'genisoimage',       'dvd+rw-tools' ]:
     ensure => installed,
   }