Skip to content

Commit 8f8309d

Browse files
JoshuaSmedaJoshuaSmedaroot-expert
authored
Remove check for Apache 2.4 (#859)
* Remove check for Apache 2.4 * Update metadata.json Pin max version to `10.0.0` Co-authored-by: Christos Papageorgiou <[email protected]> * Retrigger CI * Fix merge conflict * retrigger checks Co-authored-by: JoshuaSmeda <[email protected]> Co-authored-by: Christos Papageorgiou <[email protected]>
1 parent 7525893 commit 8f8309d

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

manifests/web.pp

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -391,14 +391,9 @@
391391
$apache_listen_port = $apache_listenport
392392
}
393393

394-
# Check which version of Apache we're using
395-
if versioncmp($apache::apache_version, '2.4') >= 0 {
396-
$directory_allow = { 'require' => 'all granted', }
397-
$directory_deny = { 'require' => 'all denied', }
398-
} else {
399-
$directory_allow = { 'allow' => 'from all', 'order' => 'Allow,Deny', }
400-
$directory_deny = { 'deny' => 'from all', 'order' => 'Deny,Allow', }
401-
}
394+
# Apache >= 2.4
395+
$directory_allow = { 'require' => 'all granted', }
396+
$directory_deny = { 'require' => 'all denied', }
402397

403398
apache::vhost { $zabbix_url:
404399
docroot => '/usr/share/zabbix',

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
},
1919
{
2020
"name": "puppetlabs/apache",
21-
"version_requirement": ">= 8.0.0 < 9.0.0"
21+
"version_requirement": ">= 9.0.0 < 10.0.0"
2222
},
2323
{
2424
"name": "puppetlabs/firewall",

0 commit comments

Comments
 (0)