diff options
Diffstat (limited to 'manifests/vhost')
-rw-r--r-- | manifests/vhost/modperl.pp | 1 | ||||
-rw-r--r-- | manifests/vhost/passenger.pp | 1 | ||||
-rw-r--r-- | manifests/vhost/php/drupal.pp | 1 | ||||
-rw-r--r-- | manifests/vhost/php/joomla.pp | 1 | ||||
-rw-r--r-- | manifests/vhost/php/mediawiki.pp | 1 | ||||
-rw-r--r-- | manifests/vhost/php/simplemachine.pp | 1 | ||||
-rw-r--r-- | manifests/vhost/php/spip.pp | 1 | ||||
-rw-r--r-- | manifests/vhost/php/standard.pp | 1 | ||||
-rw-r--r-- | manifests/vhost/php/typo3.pp | 1 | ||||
-rw-r--r-- | manifests/vhost/php/webapp.pp | 1 | ||||
-rw-r--r-- | manifests/vhost/php/wordpress.pp | 1 | ||||
-rw-r--r-- | manifests/vhost/static.pp | 3 | ||||
-rw-r--r-- | manifests/vhost/template.pp | 1 | ||||
-rw-r--r-- | manifests/vhost/webdav.pp | 1 | ||||
-rw-r--r-- | manifests/vhost/webdir.pp | 4 |
15 files changed, 19 insertions, 1 deletions
diff --git a/manifests/vhost/modperl.pp b/manifests/vhost/modperl.pp index eb78c42..88e7e52 100644 --- a/manifests/vhost/modperl.pp +++ b/manifests/vhost/modperl.pp @@ -25,6 +25,7 @@ define apache::vhost::modperl( $additional_options = 'absent', $default_charset = 'absent', $mod_security = true, + $mod_security_relevantonly = true, $ssl_mode = false, $vhost_mode = 'template', $vhost_source = 'absent', diff --git a/manifests/vhost/passenger.pp b/manifests/vhost/passenger.pp index 633721c..0279374 100644 --- a/manifests/vhost/passenger.pp +++ b/manifests/vhost/passenger.pp @@ -26,6 +26,7 @@ define apache::vhost::passenger( $additional_options = 'absent', $default_charset = 'absent', $mod_security = true, + $mod_security_relevantonly = true, $ssl_mode = false, $vhost_mode = 'template', $vhost_source = 'absent', diff --git a/manifests/vhost/php/drupal.pp b/manifests/vhost/php/drupal.pp index 68679c5..9bd5f2e 100644 --- a/manifests/vhost/php/drupal.pp +++ b/manifests/vhost/php/drupal.pp @@ -34,6 +34,7 @@ define apache::vhost::php::drupal( $additional_options = 'absent', $default_charset = 'absent', $mod_security = true, + $mod_security_relevantonly = true, $ssl_mode = false, $vhost_mode = 'template', $vhost_source = 'absent', diff --git a/manifests/vhost/php/joomla.pp b/manifests/vhost/php/joomla.pp index 39d224e..2239f52 100644 --- a/manifests/vhost/php/joomla.pp +++ b/manifests/vhost/php/joomla.pp @@ -34,6 +34,7 @@ define apache::vhost::php::joomla( $additional_options = 'absent', $default_charset = 'absent', $mod_security = true, + $mod_security_relevantonly = true, $ssl_mode = false, $vhost_mode = 'template', $vhost_source = 'absent', diff --git a/manifests/vhost/php/mediawiki.pp b/manifests/vhost/php/mediawiki.pp index d2cf346..e2f6827 100644 --- a/manifests/vhost/php/mediawiki.pp +++ b/manifests/vhost/php/mediawiki.pp @@ -34,6 +34,7 @@ define apache::vhost::php::mediawiki( $additional_options = 'absent', $default_charset = 'absent', $mod_security = true, + $mod_security_relevantonly = true, $ssl_mode = false, $vhost_mode = 'template', $vhost_source = 'absent', diff --git a/manifests/vhost/php/simplemachine.pp b/manifests/vhost/php/simplemachine.pp index 08916db..0f76528 100644 --- a/manifests/vhost/php/simplemachine.pp +++ b/manifests/vhost/php/simplemachine.pp @@ -34,6 +34,7 @@ define apache::vhost::php::simplemachine( $additional_options = 'absent', $default_charset = 'absent', $mod_security = true, + $mod_security_relevantonly = true, $ssl_mode = false, $vhost_mode = 'template', $vhost_source = 'absent', diff --git a/manifests/vhost/php/spip.pp b/manifests/vhost/php/spip.pp index cacd5e9..7b04b41 100644 --- a/manifests/vhost/php/spip.pp +++ b/manifests/vhost/php/spip.pp @@ -34,6 +34,7 @@ define apache::vhost::php::spip( $additional_options = 'absent', $default_charset = 'absent', $mod_security = true, + $mod_security_relevantonly = true, $ssl_mode = false, $vhost_mode = 'template', $vhost_source = 'absent', diff --git a/manifests/vhost/php/standard.pp b/manifests/vhost/php/standard.pp index 687696c..249f25f 100644 --- a/manifests/vhost/php/standard.pp +++ b/manifests/vhost/php/standard.pp @@ -41,6 +41,7 @@ define apache::vhost::php::standard( $default_charset = 'absent', $use_mod_macro = false, $mod_security = true, + $mod_security_relevantonly = true, $ssl_mode = false, $vhost_mode = 'template', $vhost_source = 'absent', diff --git a/manifests/vhost/php/typo3.pp b/manifests/vhost/php/typo3.pp index 950cba8..28edb84 100644 --- a/manifests/vhost/php/typo3.pp +++ b/manifests/vhost/php/typo3.pp @@ -34,6 +34,7 @@ define apache::vhost::php::typo3( $additional_options = 'absent', $default_charset = 'absent', $mod_security = true, + $mod_security_relevantonly = true, $ssl_mode = false, $vhost_mode = 'template', $vhost_source = 'absent', diff --git a/manifests/vhost/php/webapp.pp b/manifests/vhost/php/webapp.pp index e9c7f3e..929f20e 100644 --- a/manifests/vhost/php/webapp.pp +++ b/manifests/vhost/php/webapp.pp @@ -37,6 +37,7 @@ define apache::vhost::php::webapp( $additional_options = 'absent', $default_charset = 'absent', $mod_security = true, + $mod_security_relevantonly = true, $ssl_mode = false, $vhost_mode = 'template', $vhost_source = 'absent', diff --git a/manifests/vhost/php/wordpress.pp b/manifests/vhost/php/wordpress.pp index 0b94d4b..31e66e8 100644 --- a/manifests/vhost/php/wordpress.pp +++ b/manifests/vhost/php/wordpress.pp @@ -34,6 +34,7 @@ define apache::vhost::php::wordpress( $additional_options = 'absent', $default_charset = 'absent', $mod_security = true, + $mod_security_relevantonly = true, $ssl_mode = false, $vhost_mode = 'template', $vhost_source = 'absent', diff --git a/manifests/vhost/static.pp b/manifests/vhost/static.pp index 50bb3d8..6a1228a 100644 --- a/manifests/vhost/static.pp +++ b/manifests/vhost/static.pp @@ -23,7 +23,8 @@ define apache::vhost::static( $vhost_destination = 'absent', $htpasswd_file = 'absent', $htpasswd_path = 'absent', - $mod_security = false + $mod_security = false, + $mod_security_relevantonly = true ){ # create webdir ::apache::vhost::webdir{$name: diff --git a/manifests/vhost/template.pp b/manifests/vhost/template.pp index d42f65c..b0b2e8d 100644 --- a/manifests/vhost/template.pp +++ b/manifests/vhost/template.pp @@ -48,6 +48,7 @@ define apache::vhost::template( $template_mode = 'static', $ssl_mode = false, $mod_security = true, + $mod_security_relevantonly = true, $use_mod_macro = false, $htpasswd_file = 'absent', $htpasswd_path = 'absent', diff --git a/manifests/vhost/webdav.pp b/manifests/vhost/webdav.pp index 81a43eb..73c4a7a 100644 --- a/manifests/vhost/webdav.pp +++ b/manifests/vhost/webdav.pp @@ -26,6 +26,7 @@ define apache::vhost::webdav( $additional_options = 'absent', $default_charset = 'absent', $mod_security = false, + $mod_security_relevantonly = true, $ssl_mode = false, $vhost_mode = 'template', $vhost_source = 'absent', diff --git a/manifests/vhost/webdir.pp b/manifests/vhost/webdir.pp index 20ce44f..4fa9003 100644 --- a/manifests/vhost/webdir.pp +++ b/manifests/vhost/webdir.pp @@ -33,6 +33,7 @@ define apache::vhost::webdir( if $apache_default_user == '' { $real_owner = $operatingsystem ? { openbsd => 'www', + debian => 'www-data', default => $owner } } else { @@ -45,6 +46,7 @@ define apache::vhost::webdir( if $apache_default_group == '' { $real_group = $operatingsystem ? { openbsd => 'www', + debian => 'www-data', default => $group } } else { @@ -58,6 +60,7 @@ define apache::vhost::webdir( if $apache_default_user == '' { $real_documentroot_owner = $operatingsystem ? { openbsd => 'www', + debian => 'www-data', default => $documentroot_owner } } else { @@ -70,6 +73,7 @@ define apache::vhost::webdir( if $apache_default_group == '' { $real_documentroot_group = $operatingsystem ? { openbsd => 'www', + debian => 'www-data', default => $documentroot_group } } else { |