summaryrefslogtreecommitdiff
path: root/manifests/vhost
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2014-10-12 12:18:05 +0200
committermh <mh@immerda.ch>2014-10-12 12:18:05 +0200
commit9a5b4d4b56ce78d918ef6a978047bdc4d9bfb72a (patch)
tree01f57acdcfe233872eb496b2bafa1f7c3979f890 /manifests/vhost
parent5b8288629495c1b84a61880c9bcfef21e84b4b12 (diff)
a first shot of tests
Diffstat (limited to 'manifests/vhost')
-rw-r--r--manifests/vhost/php/silverstripe.pp2
-rw-r--r--manifests/vhost/php/typo3.pp2
-rw-r--r--manifests/vhost/php/wordpress.pp2
3 files changed, 3 insertions, 3 deletions
diff --git a/manifests/vhost/php/silverstripe.pp b/manifests/vhost/php/silverstripe.pp
index e7c7f24..81b0d7f 100644
--- a/manifests/vhost/php/silverstripe.pp
+++ b/manifests/vhost/php/silverstripe.pp
@@ -72,7 +72,7 @@ define apache::vhost::php::silverstripe(
default => "${path}/www"
}
$modsec_rules = ['960010']
- $real_mod_security_rules_to_disable = array_union($mod_security_rules_to_disable,$modsec_rules)
+ $real_mod_security_rules_to_disable = union($mod_security_rules_to_disable,$modsec_rules)
# create vhost configuration file
::apache::vhost::php::webapp{$name:
diff --git a/manifests/vhost/php/typo3.pp b/manifests/vhost/php/typo3.pp
index 518f898..a963c70 100644
--- a/manifests/vhost/php/typo3.pp
+++ b/manifests/vhost/php/typo3.pp
@@ -70,7 +70,7 @@ define apache::vhost::php::typo3(
}
$modsec_rules = ['960010']
- $real_mod_security_rules_to_disable = array_union($mod_security_rules_to_disable,$modsec_rules)
+ $real_mod_security_rules_to_disable = union($mod_security_rules_to_disable,$modsec_rules)
if $mod_security_additional_options == 'absent' {
$real_mod_security_additional_options = '
<Location "/typo3">
diff --git a/manifests/vhost/php/wordpress.pp b/manifests/vhost/php/wordpress.pp
index 268f33e..00e1898 100644
--- a/manifests/vhost/php/wordpress.pp
+++ b/manifests/vhost/php/wordpress.pp
@@ -70,7 +70,7 @@ define apache::vhost::php::wordpress(
default => "${path}/www"
}
$modsec_rules = ["960010", "950018"]
- $real_mod_security_rules_to_disable = array_union($mod_security_rules_to_disable,$modsec_rules)
+ $real_mod_security_rules_to_disable = union($mod_security_rules_to_disable,$modsec_rules)
# create vhost configuration file
apache::vhost::php::webapp{$name: