aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-06-18 16:47:18 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-06-18 16:47:18 -0300
commitf8d52348f58c359871d76ea21e4f50730e3fdd74 (patch)
tree3ae0058725d7553c5648cfe81752d9eafa2d2e57
parent8a7d68e796e520e613578d38ca96680f7d636b46 (diff)
downloadpuppet-nodo-f8d52348f58c359871d76ea21e4f50730e3fdd74.tar.gz
puppet-nodo-f8d52348f58c359871d76ea21e4f50730e3fdd74.tar.bz2
Adding nodo::utils::http
-rw-r--r--manifests/utils/http.pp5
-rw-r--r--manifests/utils/network/minimal.pp4
-rw-r--r--manifests/utils/web.pp4
3 files changed, 9 insertions, 4 deletions
diff --git a/manifests/utils/http.pp b/manifests/utils/http.pp
new file mode 100644
index 0000000..b2cc26a
--- /dev/null
+++ b/manifests/utils/http.pp
@@ -0,0 +1,5 @@
+class nodo::utils::http {
+ package { [ 'curl' ]:
+ ensure => present,
+ }
+}
diff --git a/manifests/utils/network/minimal.pp b/manifests/utils/network/minimal.pp
index 4c48e22..8c0145b 100644
--- a/manifests/utils/network/minimal.pp
+++ b/manifests/utils/network/minimal.pp
@@ -1,8 +1,8 @@
-class nodo::utils::network::minimal {
+class nodo::utils::network::minimal inherits nodo::utils::http {
include nodo::utils::network::irssi
include nodo::utils::network::torrent
- package { [ 'unison', 'httrack', 'zsync', 'curl' ]:
+ package { [ 'unison', 'httrack', 'zsync' ]:
ensure => installed,
}
diff --git a/manifests/utils/web.pp b/manifests/utils/web.pp
index 9c2cd71..a375a7e 100644
--- a/manifests/utils/web.pp
+++ b/manifests/utils/web.pp
@@ -1,6 +1,6 @@
# Common utilities for web
-class nodo::utils::web {
- package { [ 'ffmpeg', 'flvtool2', 'curl', 'rake',
+class nodo::utils::web inherits nodo::utils::http {
+ package { [ 'ffmpeg', 'flvtool2', 'rake',
'libxml2', 'libxml2-dev', 'libxslt1-dev', 'libmysqlclient-dev',
'g++', 'libcurl4-openssl-dev', 'apache2-prefork-dev' ]:
ensure => installed,