summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore3
-rw-r--r--puppet/manifests/setup.pp5
-rw-r--r--puppet/modules/site_config/manifests/default.pp5
3 files changed, 12 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 62603355..f9d757dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-.reviewboardrc
+/.reviewboardrc
+/puppet/modules/site_custom
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
+ }
}