diff --git a/manifests/params.pp b/manifests/params.pp index 23ebeb1ba1..80675a3530 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -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' @@ -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 diff --git a/spec/classes/dev_spec.rb b/spec/classes/dev_spec.rb index 09a031a394..e2e0b47af8 100644 --- a/spec/classes/dev_spec.rb +++ b/spec/classes/dev_spec.rb @@ -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 {