add the ability to disable the 0-default.conf and 0-default_ssl.conf virtual

hosts by setting the $apache_no_default_site variable

3 files changed, 11 insertions, 2 deletions

diff --git a/README b/README
index ad87919..0619850 100644
--- a/README
+++ b/README
@@ -48,6 +48,10 @@ You can install the ITK worker model to enforce stronger, per-user security:
 
 You can combine SSL support and the ITK worker model by including both classes.
 
+If you do not want the 0-default.conf and 0-default_ssl.conf virtualhosts
+automatically created, then simply set $apache_no_default_site = true in your
+node configuration.
+
 Configuring Apache
 ------------------
 
diff --git a/manifests/base.pp b/manifests/base.pp
index 5f2bac3..984dc32 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -43,5 +43,7 @@ class apache::base {
 
     apache::config::include{ 'defaults.inc': }
     apache::config::global{ 'git.conf': }
-    apache::vhost::file { '0-default': }
+    if !$apache_no_default_site {
+      apache::vhost::file { '0-default': }
+    }
 }
diff --git a/manifests/ssl/base.pp b/manifests/ssl/base.pp
index 4aabb40..ff9baa5 100644
--- a/manifests/ssl/base.pp
+++ b/manifests/ssl/base.pp
@@ -1,4 +1,7 @@
 class apache::ssl::base {
-    ::apache::config::include{ 'ssl_defaults.inc': }
+  ::apache::config::include{ 'ssl_defaults.inc': }
+
+  if !$apache_no_default_site {
     ::apache::vhost::file{ '0-default_ssl': }
+  }
 }