summaryrefslogtreecommitdiff
path: root/manifests/vhost/static.pp
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/vhost/static.pp')
-rw-r--r--manifests/vhost/static.pp25
1 files changed, 22 insertions, 3 deletions
diff --git a/manifests/vhost/static.pp b/manifests/vhost/static.pp
index 307dfbe..f1dbcc2 100644
--- a/manifests/vhost/static.pp
+++ b/manifests/vhost/static.pp
@@ -1,11 +1,23 @@
# vhost_mode: which option is chosen to deploy the vhost
# - template: generate it from a template (default)
# - file: deploy a vhost file (apache::vhost::file will be called directly)
+#
+# logmode:
+# - default: Do normal logging to CustomLog and ErrorLog
+# - nologs: Send every logging to /dev/null
+# - anonym: Don't log ips for CustomLog, send ErrorLog to /dev/null
+# - semianonym: Don't log ips for CustomLog, log normal ErrorLog
+#
+# mod_security: Whether we use mod_security or not (will include mod_security module)
+# - false: (*default*) don't activate mod_security
+# - true: activate mod_security
+#
define apache::vhost::static(
$ensure = present,
$domain = 'absent',
$domainalias = 'absent',
$server_admin = 'absent',
+ $logmode = 'default',
$path = 'absent',
$owner = root,
$group = apache,
@@ -18,13 +30,17 @@ define apache::vhost::static(
$additional_options = 'absent',
$default_charset = 'absent',
$ssl_mode = false,
+ $run_mode = 'normal',
$vhost_mode = 'template',
+ $template_partial = 'apache/vhosts/static/partial.erb',
$vhost_source = 'absent',
$vhost_destination = 'absent',
$htpasswd_file = 'absent',
$htpasswd_path = 'absent',
$mod_security = false,
- $mod_security_relevantonly = true
+ $mod_security_relevantonly = true,
+ $mod_security_rules_to_disable = [],
+ $mod_security_additional_options = 'absent'
){
# create webdir
::apache::vhost::webdir{$name:
@@ -32,7 +48,7 @@ define apache::vhost::static(
path => $path,
owner => $owner,
group => $group,
- run_mode => 'normal',
+ run_mode => $run_mode,
documentroot_owner => $documentroot_owner,
documentroot_group => $documentroot_group,
documentroot_mode => $documentroot_mode,
@@ -42,13 +58,14 @@ define apache::vhost::static(
::apache::vhost{$name:
ensure => $ensure,
path => $path,
- template_mode => 'static',
+ template_partial => $template_partial,
vhost_mode => $vhost_mode,
vhost_source => $vhost_source,
vhost_destination => $vhost_destination,
domain => $domain,
domainalias => $domainalias,
server_admin => $server_admin,
+ logmode => $logmode,
allow_override => $allow_override,
do_includes => $do_includes,
options => $options,
@@ -59,6 +76,8 @@ define apache::vhost::static(
htpasswd_path => $htpasswd_path,
mod_security => $mod_security,
mod_security_relevantonly => $mod_security_relevantonly,
+ mod_security_rules_to_disable => $mod_security_rules_to_disable,
+ mod_security_additional_options => $mod_security_additional_options,
}
}