diff options
author | mh <mh@immerda.ch> | 2010-08-16 22:07:47 +0200 |
---|---|---|
committer | mh <mh@immerda.ch> | 2010-08-16 22:07:47 +0200 |
commit | f33e0ae2325584d79794078cfe9a962768e7e06b (patch) | |
tree | 1bf0f4329f95ced52806c2e4d3cc9efde8c1a6c5 | |
parent | a2b49033128d11505157ff09e4a3eeea5db2c366 (diff) |
correctly fix problem
-rw-r--r-- | manifests/ssl/itk_plus.pp | 6 | ||||
-rw-r--r-- | manifests/vhost/file.pp | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/manifests/ssl/itk_plus.pp b/manifests/ssl/itk_plus.pp new file mode 100644 index 0000000..5c2d202 --- /dev/null +++ b/manifests/ssl/itk_plus.pp @@ -0,0 +1,6 @@ +class apache::ssl::itk_plus inherits apache::ssl::itk { + case $operatingsystem { + centos: { include ::apache::ssl::itk_plus::centos } + default: { fail("itk plus mode is currently only implemented for CentOS") } + } +} diff --git a/manifests/vhost/file.pp b/manifests/vhost/file.pp index d3ad773..d9e006d 100644 --- a/manifests/vhost/file.pp +++ b/manifests/vhost/file.pp @@ -95,19 +95,19 @@ define apache::vhost::file( include ::apache::itk_plus include ::apache::itk_plus::lock if $ssl_mode { - include apache::ssl::itk_plus + include ::apache::ssl::itk_plus } if $mod_security { - include mod_security::itk_plus + include ::mod_security::itk_plus } } default: { include ::apache if $ssl_mode { - include apache::ssl + include ::apache::ssl } if $mod_security { - include mod_security + include ::mod_security } } } |