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

Fixes #880 - (MODULES-1391) Correct Ubuntu Trusty mod_prefork package name #1041

Merged
merged 2 commits into from
Feb 26, 2015
Merged

Fixes #880 - (MODULES-1391) Correct Ubuntu Trusty mod_prefork package name #1041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25be287
(#1391) Correct Ubuntu Trusty mod_prefork package name
eshamow Oct 1, 2014
d5329d6
Add facts to work with strict variables.
Feb 26, 2015
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
6 changes: 5 additions & 1 deletion manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,6 @@
$logroot_mode = undef
$lib_path = '/usr/lib/apache2/modules'
$mpm_module = 'worker'
$dev_packages = ['libaprutil1-dev', 'libapr1-dev', 'apache2-prefork-dev']
$default_ssl_cert = '/etc/ssl/certs/ssl-cert-snakeoil.pem'
$default_ssl_key = '/etc/ssl/private/ssl-cert-snakeoil.key'
$ssl_certs_dir = '/etc/ssl/certs'
Expand Down Expand Up @@ -234,6 +233,11 @@
'base_rules/modsecurity_crs_60_correlation.conf'
]
$error_documents_path = '/usr/share/apache2/error'
if ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '13.10') >= 0) {
$dev_packages = ['libaprutil1-dev', 'libapr1-dev', 'apache2-dev']
} else {
$dev_packages = ['libaprutil1-dev', 'libapr1-dev', 'apache2-prefork-dev']
}

#
# Passenger-specific settings
Expand Down
13 changes: 13 additions & 0 deletions spec/classes/dev_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,19 @@
it { is_expected.to contain_package("libapr1-dev") }
it { is_expected.to contain_package("apache2-prefork-dev") }
end
context "on an Ubuntu 14 OS" do
let :facts do
{
:lsbdistrelease => '14.04',
:lsbdistcodename => 'trusty',
:osfamily => 'Debian',
:operatingsystem => 'Ubuntu',
:operatingsystemrelease => '14.04',
:is_pe => false,
}
end
it { is_expected.to contain_package("apache2-dev") }
end
context "on a RedHat OS" do
let :facts do
{
Expand Down