diff options
| author | Micah Anderson <micah@riseup.net> | 2013-04-18 16:36:48 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-04-18 16:36:48 -0400 |
| commit | 688f07793a72ba4453f6663b6d19fe6388ba382f (patch) | |
| tree | c6fde62a28eadf5052d6e7c144aa51f2e55413db | |
| parent | 6844258b567b5065f5488a12f3f18208ff36ecb0 (diff) | |
add a 'ssl' parameter, so you do not need to include two classes to get ssl
support, you can simply just pass the 'ssl => true'.
this may also help the occasional warning:
warning: Scope(Class[Apache::Ssl]): Could not look up qualified variable
'apache::manage_shorewall'; class apache has not been evaluated at
/srv/leap/puppet/modules/apache/manifests/ssl.pp:10
| -rw-r--r-- | README | 10 | ||||
| -rw-r--r-- | manifests/init.pp | 6 |
2 files changed, 10 insertions, 6 deletions
@@ -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 + } } |