From 84c5d2bf6a20ce6c4ad8d900e4cd4a8ccfda143c Mon Sep 17 00:00:00 2001
From: Bruno Tavares <btavare@thoughtworks.com>
Date: Tue, 15 Sep 2015 10:07:22 -0300
Subject: [PATCH] Fix httpd::dev.
While writing acceptance tests for puppet-httpd we noticed that the
manifest of httpd::dev was not working on Ubuntu Trusty.
That is because httpd::dev was trying to install multiple package using
the wrong syntax. Also, the one of the modules for Ubuntu was wrong and
we updated to keep applying.
Co-Authored-By: Bruno Tavares <btavare@thoughtworks.com>
Co-Authored-By: Danilo Ramalho <dramalho@thoughtworks.com>
Change-Id: Ibe1e107417b4670902f74b8c2fedc0d9d927ce9b
---
manifests/dev.pp | 3 +--
manifests/params.pp | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/manifests/dev.pp b/manifests/dev.pp
index 9632477..ddc6034 100644
--- a/manifests/dev.pp
+++ b/manifests/dev.pp
@@ -14,8 +14,7 @@
class httpd::dev {
include ::httpd::params
- package { 'apache_dev_package':
+ package { $httpd::params::apache_dev:
ensure => installed,
- name => $httpd::params::apache_dev,
}
}
diff --git a/manifests/params.pp b/manifests/params.pp
index f64def0..66b99f7 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -47,7 +47,7 @@ class httpd::params {
$mod_python_package = 'libapache2-mod-python'
$mod_wsgi_package = 'libapache2-mod-wsgi'
$ssl_package = 'apache-ssl'
- $apache_dev = ['libaprutil1-dev', 'libapr1-dev', 'apache2-prefork-dev']
+ $apache_dev = ['libaprutil1-dev', 'libapr1-dev', 'apache2-dev']
$vdir = '/etc/apache2/sites-enabled/'
}
default: {