diff options
| author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2010-05-10 11:27:10 -0400 |
|---|---|---|
| committer | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2010-05-10 11:27:10 -0400 |
| commit | 92f465fa4a522c809c5e4f58f4e87364661beb6b (patch) | |
| tree | 667a0d55d51b3d7eb91ac991e9ef4c922e44b413 /manifests/vhost | |
| parent | 6b51b05fcbb9f4ba257aa2c7d60741d7a0eca6d0 (diff) | |
| parent | 973e9107bb29bcd98868fabda464dc71e6d8af23 (diff) | |
Merge branch 'master' of git://git.puppet.immerda.ch/module-apache
Diffstat (limited to 'manifests/vhost')
| -rw-r--r-- | manifests/vhost/redirect.pp | 1 | ||||
| -rw-r--r-- | manifests/vhost/template.pp | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/manifests/vhost/redirect.pp b/manifests/vhost/redirect.pp index 7422629..10b78bf 100644 --- a/manifests/vhost/redirect.pp +++ b/manifests/vhost/redirect.pp @@ -27,6 +27,7 @@ define apache::vhost::redirect( domainalias => $domainalias, server_admin => $server_admin, allow_override => $allow_override, + mod_security => false, options => $target_url, ssl_mode => $ssl_mode, } diff --git a/manifests/vhost/template.pp b/manifests/vhost/template.pp index a9e0dbe..324a96a 100644 --- a/manifests/vhost/template.pp +++ b/manifests/vhost/template.pp @@ -58,7 +58,10 @@ define apache::vhost::template( $ldap_user = 'any' ){ if $mod_security { - include mod_security + case $run_mode { + 'itk': { include mod_security::itk } + default: { include mod_security } + } } $real_path = $path ? { |