summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2014-02-20 14:38:44 -0500
committerJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2014-02-20 14:38:44 -0500
commit4810d7ea6b199d97939cc0a85091403e08407557 (patch)
treeaf7f471e72249d635f8e8a82c14bcdfba80b487c
parent36f525a8f36d0c7561ffadbfa53dab00ebf556a7 (diff)
Prevent duplicate declarations of 'apt' class
-rw-r--r--manifests/puppetmaster/passenger.pp4
1 files changed, 3 insertions, 1 deletions
diff --git a/manifests/puppetmaster/passenger.pp b/manifests/puppetmaster/passenger.pp
index ba71141..4361412 100644
--- a/manifests/puppetmaster/passenger.pp
+++ b/manifests/puppetmaster/passenger.pp
@@ -17,7 +17,9 @@ class puppet::puppetmaster::passenger inherits puppet::puppetmaster::base {
owner => puppet, group => 0, mode => '0644';
}
- include apt
+ if !defined('apt') {
+ include apt
+ }
$puppet_passenger_snippet = $puppetmaster_ensure_version ? {
undef => absent,