summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Filion <gabster@lelutin.ca>2013-11-09 02:04:45 -0500
committerGabriel Filion <gabster@lelutin.ca>2013-11-09 02:04:45 -0500
commit98444225af9935f6fcd15021e977369b3d84ffba (patch)
treefa2d42d036b37649aab5f90d807ddad61c692bce
parent59e7fcc6debe8a161114720fa4392221252ad998 (diff)
parentc3e92a9b3cb02f1546b6b1570f10a968d380005c (diff)
Merge remote-tracking branch 'leap/master'
-rw-r--r--README10
-rw-r--r--manifests/init.pp6
-rw-r--r--manifests/ssl/base.pp2
3 files changed, 11 insertions, 7 deletions
diff --git a/README b/README
index ff6d338..b723a54 100644
--- a/README
+++ b/README
@@ -77,18 +77,18 @@ class to have the module do some things for you:
0-default_ssl.conf virtualhosts automatically created in your node
configuration. (Default: false)
+ * ssl: If you want to install Apache SSL support enabled, just pass this
+ parameter (Default: false)
+
For example:
class { 'apache':
manage_shorewall => true,
manage_munin => true,
- no_default_site => true
+ no_default_site => true,
+ ssl => true
}
-If you want to install Apache and also enable SSL support:
-
- include apache::ssl
-
You can install the ITK worker model to enforce stronger, per-user security:
include apache::itk
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': }
}
}