Adding utils and utils::server

diff --git a/manifests/init.pp b/manifests/init.pp
index 6f05dd3f2f6741108f5187707fab1b33b9866c4c..c2487a1dfc03d3e1730460551c16f2175161c4c4 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -10,6 +10,7 @@ import "motd.pp"
 import "sudo.pp"
 import "sysctl.pp"
 import "ups.pp"
+import "utils.pp"
 
 class nodo {
   include lsb
@@ -19,6 +20,7 @@ class nodo {
   include sudo
   include users::admin
   include motd
+  include utils
 
   # Set timezone and ntp config
   #
@@ -74,6 +76,7 @@ class nodo::server inherits nodo {
   include firewire
   include sysctl
   include ups
+  include utils::server
 
   # Time configuration
   case $ntpdate {
@@ -314,6 +317,5 @@ class nodo::web inherits nodo::vserver {
 }
 
 class nodo::proxy inherits nodo::vserver {
-  # TODO: openssl?
   include nginx
 }

diff --git a/manifests/utils.pp b/manifests/utils.pp
new file mode 100644 (file)
index 0000000..2ec62b1
--- /dev/null
+++ b/manifests/utils.pp
@@ -0,0 +1,13 @@
+# Common utilities
+class utils {
+  package { [ 'screen', 'less', 'bzip2', 'openssl', 'lynx', 'wget' ]:
+    ensure => installed,
+  }
+}
+
+# Common utilities for servers
+class utils::server {
+  package { 'nload':
+    ensure => installed,
+  }
+}