summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'manifests')
-rw-r--r--manifests/base.pp4
-rw-r--r--manifests/ssl/base.pp5
2 files changed, 7 insertions, 2 deletions
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': }
+ }
}