GitLab upgraded to 13.11.4-ee.0 - changelog: https://gitlab.com/gitlab-org/gitlab/blob/master/CHANGELOG-EE.md

Unverified Commit a13b7449 authored by Dan Webb's avatar Dan Webb Committed by GitHub
Browse files

Merge branch 'master' into custom_resources

parents 756ee4c7 234fabba
......@@ -18,6 +18,19 @@
# limitations under the License.
#
# Gets the libdir for a given CPU architecture
def lib_dir_for_machine(arch)
if arch =~ /64/ || %w(armv8l s390x).include?(arch)
# 64-bit architectures
# (x86_64 / amd64 / aarch64 / armv8l / etc.)
'/usr/lib64'
else
# 32-bit architectures
# (i686 / armv7l / s390 / etc.)
'/usr/lib'
end
end
default['apache']['mpm'] =
case node['platform']
when 'ubuntu', 'linuxmint'
......@@ -59,7 +72,7 @@ when 'rhel', 'fedora', 'amazon'
default['apache']['run_dir'] = '/var/run/httpd'
default['apache']['lock_dir'] = '/var/run/httpd'
default['apache']['pid_file'] = '/var/run/httpd/httpd.pid'
default['apache']['lib_dir'] = node['kernel']['machine'] =~ /^i[36]86$/ ? '/usr/lib/httpd' : '/usr/lib64/httpd'
default['apache']['lib_dir'] = "#{lib_dir_for_machine(node['kernel']['machine'])}/httpd"
default['apache']['libexec_dir'] = "#{node['apache']['lib_dir']}/modules"
when 'suse'
default['apache']['package'] = 'apache2'
......@@ -81,7 +94,7 @@ when 'suse'
default['apache']['run_dir'] = '/var/run/httpd'
default['apache']['lock_dir'] = '/var/run/httpd'
default['apache']['pid_file'] = '/var/run/httpd2.pid'
default['apache']['lib_dir'] = node['kernel']['machine'] =~ /^i[36]86$/ ? '/usr/lib/apache2' : '/usr/lib64/apache2'
default['apache']['lib_dir'] = "#{lib_dir_for_machine(node['kernel']['machine'])}/apache2"
default['apache']['libexec_dir'] = node['apache']['lib_dir']
when 'debian'
default['apache']['package'] = 'apache2'
......
......@@ -18,6 +18,7 @@
#
default['apache2']['mod_pagespeed']['package_link'] =
# NOTE: no precompiled packages for other architectures
if node['kernel']['machine'] =~ /^i[36']86$/
'https://dl-ssl.google.com/dl/linux/direct/mod-pagespeed-stable_current_i386.deb'
else
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment