aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-01-22 15:30:53 -0200
committerSilvio Rhatto <rhatto@riseup.net>2010-01-22 15:30:53 -0200
commitdc894e3b94be5697c33c0ef1db168517a44a109e (patch)
treec73858563348c42475c6d8f4d06e095155c2b003 /manifests
parent98f4d52829cd41f0b738a655afbbf57c9831b288 (diff)
downloadpuppet-nodo-dc894e3b94be5697c33c0ef1db168517a44a109e.tar.gz
puppet-nodo-dc894e3b94be5697c33c0ef1db168517a44a109e.tar.bz2
Adding utils and utils::server
Diffstat (limited to 'manifests')
-rw-r--r--manifests/init.pp4
-rw-r--r--manifests/utils.pp13
2 files changed, 16 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 6f05dd3..c2487a1 100644
--- 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
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,
+ }
+}