Adding nodo::utils::http

diff --git a/manifests/utils/http.pp b/manifests/utils/http.pp
new file mode 100644 (file)
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 4c48e224cbdea5e3e5d12b701c1ff9317115dd30..8c0145b6848513e775a7d0ced7a7184795f43938 100644 (file)
--- 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 9c2cd71f530e2278a43ffe3087e0a2a0cf269364..a375a7ea6f16010fa9fc128e16fbf66bb5d56aa5 100644 (file)
--- 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,