summaryrefslogtreecommitdiff
path: root/manifests/vhost/php/webapp.pp
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/vhost/php/webapp.pp')
-rw-r--r--manifests/vhost/php/webapp.pp71
1 files changed, 50 insertions, 21 deletions
diff --git a/manifests/vhost/php/webapp.pp b/manifests/vhost/php/webapp.pp
index 22e932a..54905ca 100644
--- a/manifests/vhost/php/webapp.pp
+++ b/manifests/vhost/php/webapp.pp
@@ -1,24 +1,38 @@
-# run_mode:
-# - normal: nothing special (*default*)
-# - itk: apache is running with the itk module
-# and run_uid and run_gid are used as vhost users
+# run_mode: controls in which mode the vhost should be run, there are different setups
+# possible:
+# - normal: (*default*) run vhost with the current active worker (default: prefork) don't
+# setup anything special
+# - itk: run vhost with the mpm_itk module (Incompatibility: cannot be used in combination
+# with 'proxy-itk' & 'static-itk' mode)
+# - proxy-itk: run vhost with a dual prefork/itk setup, where prefork just proxies all the
+# requests for the itk setup, that listens only on the loobpack device.
+# (Incompatibility: cannot be used in combination with the itk setup.)
+# - static-itk: run vhost with a dual prefork/itk setup, where prefork serves all the static
+# content and proxies the dynamic calls to the itk setup, that listens only on
+# the loobpack device (Incompatibility: cannot be used in combination with
+# 'itk' mode)
+#
# run_uid: the uid the vhost should run as with the itk module
# run_gid: the gid the vhost should run as with the itk module
-# php_safe_mode_exec_bins: An array of local binaries which should be linked in the
-# safe_mode_exec_bin for this hosting
-# *default*: None
-# php_default_charset: default charset header for php.
-# *default*: absent, which will set the same as default_charset
-# of apache
+#
+# mod_security: Whether we use mod_security or not (will include mod_security module)
+# - false: don't activate mod_security
+# - true: (*default*) activate mod_security
+#
+# 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
define apache::vhost::php::webapp(
$ensure = present,
$domain = 'absent',
$domainalias = 'absent',
$server_admin = 'absent',
+ $logmode = 'default',
$path = 'absent',
$manage_webdir = true,
$manage_docroot = true,
- $template_mode,
$owner = root,
$group = apache,
$documentroot_owner = apache,
@@ -28,18 +42,19 @@ define apache::vhost::php::webapp(
$run_uid = 'absent',
$run_gid = 'absent',
$allow_override = 'None',
- $php_upload_tmp_dir = 'absent',
- $php_session_save_path = 'absent',
- $php_safe_mode_exec_bins = 'absent',
- $php_default_charset = 'absent',
+ $php_settings = {},
+ $php_options = {},
$do_includes = false,
$options = 'absent',
$additional_options = 'absent',
$default_charset = 'absent',
$mod_security = true,
$mod_security_relevantonly = true,
+ $mod_security_rules_to_disable = [],
+ $mod_security_additional_options = 'absent',
$ssl_mode = false,
$vhost_mode = 'template',
+ $template_partial,
$vhost_source = 'absent',
$vhost_destination = 'absent',
$htpasswd_file = 'absent',
@@ -59,7 +74,20 @@ define apache::vhost::php::webapp(
}
if $manage_config {
- if $config_file == 'absent' { fail("No config file defined for ${name} on ${fqdn}, if you'd like to manage the config, you have to add one!") }
+ if $config_file == 'absent' { fail("No config file defined for ${name} on ${::fqdn}, if you'd like to manage the config, you have to add one!") }
+
+ $real_path = $path ? {
+ 'absent' => $::operatingsystem ? {
+ openbsd => "/var/www/htdocs/${name}",
+ default => "/var/www/vhosts/${name}"
+ },
+ default => $path
+ }
+ if $path_is_webdir {
+ $documentroot = $real_path
+ } else {
+ $documentroot = "${real_path}/www"
+ }
::apache::vhost::file::documentrootfile{"configurationfile_${name}":
documentroot => $documentroot,
filename => $config_file,
@@ -85,10 +113,10 @@ define apache::vhost::php::webapp(
domain => $domain,
domainalias => $domainalias,
server_admin => $server_admin,
+ logmode => $logmode,
path => $path,
manage_webdir => $manage_webdir,
manage_docroot => $manage_docroot,
- template_mode => $template_mode,
owner => $owner,
group => $group,
documentroot_owner => $documentroot_owner,
@@ -98,18 +126,19 @@ define apache::vhost::php::webapp(
run_uid => $run_uid,
run_gid => $run_gid,
allow_override => $allow_override,
- php_upload_tmp_dir => $php_upload_tmp_dir,
- php_session_save_path => $php_session_save_path,
- php_safe_mode_exec_bins => $php_safe_mode_exec_bins,
- php_default_charset => $php_default_charset,
+ php_settings => $php_settings,
+ php_options => $php_options,
do_includes => $do_includes,
options => $options,
additional_options => $additional_options,
default_charset => $default_charset,
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,
ssl_mode => $ssl_mode,
vhost_mode => $vhost_mode,
+ template_partial => $template_partial,
vhost_source => $vhost_source,
vhost_destination => $vhost_destination,
htpasswd_file => $htpasswd_file,