summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'manifests')
-rw-r--r--manifests/init.pp6
-rw-r--r--manifests/ssl/base.pp2
2 files changed, 6 insertions, 2 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 574c212..542e7aa 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -17,7 +17,8 @@ class apache(
$cluster_node = '',
$manage_shorewall = false,
$manage_munin = false,
- $no_default_site = false
+ $no_default_site = false,
+ $ssl = false
) {
case $::operatingsystem {
centos: { include apache::centos }
@@ -32,5 +33,8 @@ class apache(
if $apache::manage_shorewall {
include shorewall::rules::http
}
+ if $ssl {
+ include apache::ssl
+ }
}
diff --git a/manifests/ssl/base.pp b/manifests/ssl/base.pp
index ff9baa5..7c17423 100644
--- a/manifests/ssl/base.pp
+++ b/manifests/ssl/base.pp
@@ -1,7 +1,7 @@
class apache::ssl::base {
::apache::config::include{ 'ssl_defaults.inc': }
- if !$apache_no_default_site {
+ if !$apache::no_default_site {
::apache::vhost::file{ '0-default_ssl': }
}
}