summaryrefslogtreecommitdiff
path: root/manifests/base.pp
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-10-14 18:23:31 +0200
committervarac <varacanero@zeromail.org>2015-10-14 18:27:00 +0200
commitd077a7b11c95089882e08432c45b883a9097e81d (patch)
tree0a6ff28331f9b43382c6f7a3d758556aeba497d7 /manifests/base.pp
parentae53b180783016faa4331094a52769ddd57463f8 (diff)
[feat] Use ensure_packages() instead of package{}
The rationale behind this is that many modules might ensure the same packages to be installed, and this will result in duplicate package definitions. ensure_packages() from the stdlib module with solve this. - Resolves: #7530
Diffstat (limited to 'manifests/base.pp')
-rw-r--r--manifests/base.pp14
1 files changed, 5 insertions, 9 deletions
diff --git a/manifests/base.pp b/manifests/base.pp
index f738e26..66c80ad 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -8,9 +8,7 @@ class couchdb::base {
$couchdb_user = 'couchdb'
}
- package { 'couchdb':
- ensure => present
- }
+ ensure_packages ('couchdb')
service { 'couchdb':
ensure => running,
@@ -28,15 +26,13 @@ class couchdb::base {
# couchrest gem is required for couch-doc-update script,
# and it needs the ruby-dev package installed to build
- class {'::ruby':
- install_dev => true
- }
+ #include ruby::devel
- package { 'couchrest':
- ensure => installed,
+ ensure_packages('ruby-dev')
+ ensure_packages('couchrest', {
provider => 'gem',
require => Package['ruby-dev']
- }
+ })
File['/usr/local/bin/couch-doc-update'] -> Couchdb::Update <| |>
File['/usr/local/bin/couch-doc-diff'] -> Couchdb::Update <| |>