Skip to content

Commit 319ed84

Browse files
committed
only load mod::php on non EL systems
on EL we default to FPM anyway
1 parent b4337d1 commit 319ed84

File tree

6 files changed

+18
-6
lines changed

6 files changed

+18
-6
lines changed

spec/acceptance/zabbix_application_spec.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222
class { 'apache':
2323
mpm_module => 'prefork',
2424
}
25-
include apache::mod::php
25+
if $facts['os']['family'] != 'RedHat' {
26+
include apache::mod::php
27+
}
2628
class { 'postgresql::globals':
2729
locale => 'en_US.UTF-8',
2830
manage_package_repo => $facts['os']['release']['major'] != '8',

spec/acceptance/zabbix_host_spec.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@
3131
class { 'apache':
3232
mpm_module => 'prefork',
3333
}
34-
include apache::mod::php
34+
if $facts['os']['family'] != 'RedHat' {
35+
include apache::mod::php
36+
}
3537
class { 'postgresql::globals':
3638
locale => 'en_US.UTF-8',
3739
manage_package_repo => $facts['os']['release']['major'] != '8',

spec/acceptance/zabbix_hostgroup_spec.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
class { 'apache':
1616
mpm_module => 'prefork',
1717
}
18-
include apache::mod::php
18+
if $facts['os']['family'] != 'RedHat' {
19+
include apache::mod::php
20+
}
1921
class { 'postgresql::globals':
2022
locale => 'en_US.UTF-8',
2123
manage_package_repo => $facts['os']['release']['major'] != '8',

spec/acceptance/zabbix_proxy_spec.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
class { 'apache':
1717
mpm_module => 'prefork',
1818
}
19-
include apache::mod::php
19+
if $facts['os']['family'] != 'RedHat' {
20+
include apache::mod::php
21+
}
2022
class { 'postgresql::globals':
2123
locale => 'en_US.UTF-8',
2224
manage_package_repo => $facts['os']['release']['major'] != '8',

spec/acceptance/zabbix_template_host_spec.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
class { 'apache':
2525
mpm_module => 'prefork',
2626
}
27-
include apache::mod::php
27+
if $facts['os']['family'] != 'RedHat' {
28+
include apache::mod::php
29+
}
2830
class { 'postgresql::globals':
2931
locale => 'en_US.UTF-8',
3032
manage_package_repo => $facts['os']['release']['major'] != '8',

spec/acceptance/zabbix_template_spec.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
class { 'apache':
1616
mpm_module => 'prefork',
1717
}
18-
include apache::mod::php
18+
if $facts['os']['family'] != 'RedHat' {
19+
include apache::mod::php
20+
}
1921
class { 'postgresql::globals':
2022
locale => 'en_US.UTF-8',
2123
manage_package_repo => $facts['os']['release']['major'] != '8',

0 commit comments

Comments
 (0)