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

Jump to bottom

include mod_expire on el9 for web and downloads #2160

Merged
merged 1 commit into from
Nov 27, 2024
Merged

include mod_expire on el9 for web and downloads #2160

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
7 changes: 7 additions & 0 deletions puppet/modules/web/manifests/vhost/downloads.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,13 @@
directories => $downloads_directory_config,
}

# vhosts don't autorequire the expires module
# https://github.com/puppetlabs/puppetlabs-apache/pull/2559
# limit to not EL7 as there we use apache::default_mods
if $facts['os']['family'] != 'RedHat' or $facts['os']['release']['major'] != '7' {
include apache::mod::expires
}

file { "${downloads_directory}/HEADER.html":
ensure => file,
owner => 'root',
Expand Down
7 changes: 7 additions & 0 deletions puppet/modules/web/manifests/vhost/web.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,13 @@
},
}

# vhosts don't autorequire the expires module
# https://github.com/puppetlabs/puppetlabs-apache/pull/2559
# limit to not EL7 as there we use apache::default_mods
if $facts['os']['family'] != 'RedHat' or $facts['os']['release']['major'] != '7' {
include apache::mod::expires
}

secure_ssh::rsync::receiver_setup { 'web':
user => 'website',
foreman_search => 'host ~ node*.jenkins.osuosl.theforeman.org and (name = external_ip4 or name = external_ip6)',
Expand Down