Skip to content
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

jobrunner: remove default ports from apache2 #3789

Merged
merged 1 commit into from
Mar 24, 2024
Merged

jobrunner: remove default ports from apache2 #3789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions hieradata/hosts/mwtask171.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,5 @@ nginx::keepalive_requests: 150
nginx::logrotate_number: 2
nginx::use_graylog: true
nginx::remove_apache: false

httpd::remove_default_ports: true
2 changes: 2 additions & 0 deletions hieradata/hosts/mwtask181.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,5 @@ nginx::keepalive_requests: 150
nginx::logrotate_number: 2
nginx::use_graylog: true
nginx::remove_apache: false

httpd::remove_default_ports: true
2 changes: 2 additions & 0 deletions hieradata/hosts/test151.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ nginx::logrotate_number: 2
nginx::use_graylog: true
nginx::remove_apache: false

httpd::remove_default_ports: true

# memcached
role::memcached::threads: ~
role::memcached::version: 'present'
Expand Down
4 changes: 2 additions & 2 deletions modules/httpd/manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@
# @param wait_network_online Set to true to have the service to run after
# network-online.target. Can be used when Apache is configured to Listen to
# an explicit IP address.
class httpd(
class httpd (
Array[String] $modules = [],
VMlib::Ensure $legacy_compat = present,
Enum['daily', 'weekly'] $period = 'daily',
Integer $rotate = 30,
Boolean $enable_forensic_log = false,
Array[String] $extra_pkgs = [],
Boolean $purge_manual_config = true,
Boolean $remove_default_ports = false,
Boolean $http_only = false,
Boolean $wait_network_online = false,
Boolean $remove_default_ports = lookup('httpd::remove_default_ports', {'default_value' => false}),
) {
# Package and service. Links is needed for the status page below
$base_pkgs = ['apache2', 'links']
Expand Down
Loading