Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
mirror
apache2
Commits
a13b7449
Unverified
Commit
a13b7449
authored
Mar 26, 2018
by
Dan Webb
Committed by
GitHub
Mar 26, 2018
Browse files
Merge branch 'master' into custom_resources
parents
756ee4c7
234fabba
Changes
2
Hide whitespace changes
Inline
Side-by-side
attributes/default.rb
View file @
a13b7449
...
...
@@ -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'
...
...
attributes/mod_pagespeed.rb
View file @
a13b7449
...
...
@@ -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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment