From 6fad804981dd059f2de3d18b1cb53af05a736f75 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Mon, 5 Nov 2012 18:13:26 -0500
Subject: add the ability to disable the 0-default.conf and 0-default_ssl.conf
 virtual hosts by setting the $apache_no_default_site variable

---
 manifests/base.pp     | 4 +++-
 manifests/ssl/base.pp | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'manifests')

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': }
+  }
 }
-- 
cgit v1.2.3