summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-10-20 20:59:22 +0200
committervarac <varacanero@zeromail.org>2013-10-20 20:59:22 +0200
commitd272b9a45b1099a17719fbe3c77b24f10b5de5cb (patch)
treefa0b6de2c4be54161bf6b7d81139d26440bbe068 /puppet
parente142dcb4d4b3f51fa711cb3f4e4957d78110f039 (diff)
Possibility to include local puppet recipes (Feature #3976)
Diffstat (limited to 'puppet')
-rw-r--r--puppet/manifests/setup.pp5
-rw-r--r--puppet/modules/site_config/manifests/default.pp5
2 files changed, 10 insertions, 0 deletions
diff --git a/puppet/manifests/setup.pp b/puppet/manifests/setup.pp
index 84124f5a..f89b7032 100644
--- a/puppet/manifests/setup.pp
+++ b/puppet/manifests/setup.pp
@@ -32,3 +32,8 @@ if ( $::site_config::params::environment == 'local' ) {
include site_config::vagrant
}
+# if class site_custom::setup exists, include it.
+# possibility for users to define custom puppet recipes
+if defined( '::site_custom::setup') {
+ include ::site_custom::setup
+}
diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp
index 2380066a..33d3df05 100644
--- a/puppet/modules/site_config/manifests/default.pp
+++ b/puppet/modules/site_config/manifests/default.pp
@@ -79,4 +79,9 @@ class site_config::default {
include site_postfix::satellite
}
+ # if class site_custom exists, include it.
+ # possibility for users to define custom puppet recipes
+ if defined( '::site_custom') {
+ include ::site_custom
+ }
}