From 680f3a9ff04e4d7f057942d72a8834a9be205ad2 Mon Sep 17 00:00:00 2001 From: Damon Conway Date: Tue, 6 Oct 2015 12:22:37 -0700 Subject: [PATCH] (MODULES-2673) Adding dev_packages to apache class. Allows use of httpd24u-devel from the IUS repo. Adding documentation to README for dev_packages param to the apache class. Adding include apache::dev to example for dev_packages param. --- README.md | 14 ++++++++++++++ manifests/dev.pp | 2 +- manifests/init.pp | 1 + 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a5012f4db..4f4396176 100644 --- a/README.md +++ b/README.md @@ -888,6 +888,20 @@ Configures a default virtual host when the class is declared. Valid options: Boo To configure [customized virtual hosts][Configuring virtual hosts], set this parameter's value to 'false'. +##### `dev_packages` + +Configures a specific dev package to use. Valid options: String. Default: 'OS default httpd dev package'. + +Example for using httpd 2.4 from the IUS yum repo: + +~~~ puppet +include ::apache::dev +class { 'apache': + apache_name => 'httpd24u', + dev_packages => 'httpd24u-devel', +} +~~~ + ##### `docroot` Sets the default [`DocumentRoot`][] location. Default: Determined by your operating system. diff --git a/manifests/dev.pp b/manifests/dev.pp index b1947e934..fdebf59f5 100644 --- a/manifests/dev.pp +++ b/manifests/dev.pp @@ -1,6 +1,6 @@ class apache::dev { include ::apache::params - $packages = $::apache::params::dev_packages + $packages = $::apache::dev_packages if $packages { # FreeBSD doesn't have dev packages to install package { $packages: ensure => present, diff --git a/manifests/init.pp b/manifests/init.pp index 5f02bfd61..2361c5457 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -28,6 +28,7 @@ $default_ssl_crl = undef, $default_ssl_crl_check = undef, $default_type = 'none', + $dev_packages = $::apache::params::dev_packages, $ip = undef, $service_enable = true, $service_manage = true,