summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah <micah@leap.se>2015-10-15 17:12:48 -0400
committervarac <varacanero@zeromail.org>2015-10-17 13:16:38 +0200
commit2443311119a618e544f0f701c4a596690a3fcd05 (patch)
tree691642630e34eea230c8b009b1f120b8abc3017a
parent81763f22e0e5515fa2a3b9c8a65050692bb1cf74 (diff)
switch to ensure_packages to avoid puppet duplicate package definitions (#7530)
Change-Id: I398b929fc96cf64e46075266ace0d8d1145b3aac
-rw-r--r--puppet/modules/clamav/manifests/unofficial_sigs.pp5
m---------puppet/modules/couchdb0
m---------puppet/modules/ruby0
3 files changed, 3 insertions, 2 deletions
diff --git a/puppet/modules/clamav/manifests/unofficial_sigs.pp b/puppet/modules/clamav/manifests/unofficial_sigs.pp
index 316154d3..2d849585 100644
--- a/puppet/modules/clamav/manifests/unofficial_sigs.pp
+++ b/puppet/modules/clamav/manifests/unofficial_sigs.pp
@@ -1,10 +1,11 @@
class clamav::unofficial_sigs {
- package { [ 'clamav-unofficial-sigs', 'wget', 'gnupg',
- 'socat', 'rsync', 'curl' ]:
+ package { 'clamav-unofficial-sigs':
ensure => installed
}
+ ensure_packages(['wget', 'gnupg', 'socat', 'rsync', 'curl'])
+
file {
'/var/log/clamav-unofficial-sigs.log':
ensure => file,
diff --git a/puppet/modules/couchdb b/puppet/modules/couchdb
-Subproject ae53b180783016faa4331094a52769ddd57463f
+Subproject d077a7b11c95089882e08432c45b883a9097e81
diff --git a/puppet/modules/ruby b/puppet/modules/ruby
-Subproject e4de25d78eefc7df70a35dee22a3e0dc1b7e1d0
+Subproject 0fb2b398dbfce59c678d6f4044a55969e42c6d4