Skip to content

Commit

Permalink
Remove check for Apache 2.4 (#859)
Browse files Browse the repository at this point in the history
* Remove check for Apache 2.4

* Update metadata.json

Pin max version to `10.0.0`

Co-authored-by: Christos Papageorgiou <christos.papageorgioy@gmail.com>

* Retrigger CI

* Fix merge conflict

* retrigger checks

Co-authored-by: JoshuaSmeda <joshua.smeda@xneelo.com>
Co-authored-by: Christos Papageorgiou <christos.papageorgioy@gmail.com>
  • Loading branch information
3 people committed Jan 11, 2023
1 parent 7525893 commit 8f8309d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
11 changes: 3 additions & 8 deletions manifests/web.pp
Expand Up @@ -391,14 +391,9 @@
$apache_listen_port = $apache_listenport
}

# Check which version of Apache we're using
if versioncmp($apache::apache_version, '2.4') >= 0 {
$directory_allow = { 'require' => 'all granted', }
$directory_deny = { 'require' => 'all denied', }
} else {
$directory_allow = { 'allow' => 'from all', 'order' => 'Allow,Deny', }
$directory_deny = { 'deny' => 'from all', 'order' => 'Deny,Allow', }
}
# Apache >= 2.4
$directory_allow = { 'require' => 'all granted', }
$directory_deny = { 'require' => 'all denied', }

apache::vhost { $zabbix_url:
docroot => '/usr/share/zabbix',
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
Expand Up @@ -18,7 +18,7 @@
},
{
"name": "puppetlabs/apache",
"version_requirement": ">= 8.0.0 < 9.0.0"
"version_requirement": ">= 9.0.0 < 10.0.0"
},
{
"name": "puppetlabs/firewall",
Expand Down

0 comments on commit 8f8309d

Please sign in to comment.