Skip to content

Stricter data types and better module inclusion in vhost.pp #2250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 19 commits into from
Closed

Stricter data types and better module inclusion in vhost.pp #2250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
11d37f4
Use a stricter data type on apache::vhost::aliases
ekohl Jun 22, 2022
6446580
Correct parameter alignment
ekohl Jun 22, 2022
7bf8263
Include apache::mod::alias locally
ekohl Jun 22, 2022
a69c33a
Include apache::mod::proxy locally
ekohl Jun 22, 2022
3d50157
Inlcude apache::mod::fastcgi locally
ekohl Jun 22, 2022
de7f60a
Clean up inclusion of mod::env and mod::setenvif
ekohl Jun 22, 2022
0df7f8f
Simplify scriptalias template
ekohl Jun 22, 2022
e92c195
Localize apache::mod::vhost_alias inclusion
ekohl Jun 22, 2022
2f376bc
Localize apache::mod::wsgi inclusion
ekohl Jun 22, 2022
8ba9830
Localize apache::mod::suexec inclusion
ekohl Jun 22, 2022
dfd14f9
Localize apache::mod::passenger inclusion
ekohl Jun 22, 2022
e05f97f
Localize apache::mod::auth_kerb inclusion
ekohl Jun 22, 2022
b5d74a9
Localize apache::mod::auth_openidc inclusion
ekohl Jun 22, 2022
342b160
Localize apache::mod::ssl inclusion
ekohl Jun 22, 2022
d4320a7
Simplify apache::vhost::serveraliases logic
ekohl Jun 22, 2022
0c5c847
Document uses of $mdomain
ekohl Jun 22, 2022
9951bec
Only include modules if ensure is present
ekohl Jun 22, 2022
619e9c9
Properly require proxy mods
ekohl Jun 22, 2022
18eed8e
Tighten apache::vhost::directories parameter
ekohl Jun 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion manifests/mod/proxy_ajp.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
# @see https://httpd.apache.org/docs/current/mod/mod_proxy_ajp.html for additional documentation.
#
class apache::mod::proxy_ajp {
Class['apache::mod::proxy'] -> Class['apache::mod::proxy_ajp']
require apache::mod::proxy
::apache::mod { 'proxy_ajp': }
}
6 changes: 2 additions & 4 deletions manifests/mod/proxy_balancer.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,12 @@
Array $allow_from = ['127.0.0.1','::1'],
Optional[String] $apache_version = $apache::apache_version,
) {
include apache::mod::proxy
include apache::mod::proxy_http
require apache::mod::proxy
require apache::mod::proxy_http
if versioncmp($apache_version, '2.4') >= 0 {
::apache::mod { 'slotmem_shm': }
}

Class['apache::mod::proxy'] -> Class['apache::mod::proxy_balancer']
Class['apache::mod::proxy_http'] -> Class['apache::mod::proxy_balancer']
::apache::mod { 'proxy_balancer': }
if $manager {
include apache::mod::status
Expand Down
2 changes: 1 addition & 1 deletion manifests/mod/proxy_connect.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
#
class apache::mod::proxy_connect {
include apache
Class['apache::mod::proxy'] -> Class['apache::mod::proxy_connect']
require apache::mod::proxy
apache::mod { 'proxy_connect': }
}
2 changes: 1 addition & 1 deletion manifests/mod/proxy_fcgi.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
# @see https://httpd.apache.org/docs/current/mod/mod_proxy_fcgi.html for additional documentation.
#
class apache::mod::proxy_fcgi {
Class['apache::mod::proxy'] -> Class['apache::mod::proxy_fcgi']
require apache::mod::proxy
::apache::mod { 'proxy_fcgi': }
}
4 changes: 2 additions & 2 deletions manifests/mod/proxy_html.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#
class apache::mod::proxy_html {
include apache
Class['apache::mod::proxy'] -> Class['apache::mod::proxy_html']
Class['apache::mod::proxy_http'] -> Class['apache::mod::proxy_html']
require apache::mod::proxy
require apache::mod::proxy_http

# Add libxml2
case $facts['os']['family'] {
Expand Down
2 changes: 1 addition & 1 deletion manifests/mod/proxy_http.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
# @see https://httpd.apache.org/docs/current/mod/mod_proxy_http.html for additional documentation.
#
class apache::mod::proxy_http {
Class['apache::mod::proxy'] -> Class['apache::mod::proxy_http']
require apache::mod::proxy
::apache::mod { 'proxy_http': }
}
4 changes: 2 additions & 2 deletions manifests/mod/proxy_wstunnel.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# @see https://httpd.apache.org/docs/current/mod/mod_proxy_wstunnel.html for additional documentation.
#
class apache::mod::proxy_wstunnel {
include apache, apache::mod::proxy
Class['apache::mod::proxy'] -> Class['apache::mod::proxy_wstunnel']
include apache
require apache::mod::proxy
::apache::mod { 'proxy_wstunnel': }
}
Loading