From e87c60f40f3f9b412d98c25d45044f4a28dbcc11 Mon Sep 17 00:00:00 2001
From: Timo Goebel <mail@timogoebel.name>
Date: Tue, 14 Mar 2017 11:02:48 +0100
Subject: [PATCH] qpid does not need apache

---
 manifests/qpid.pp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/manifests/qpid.pp b/manifests/qpid.pp
index 54ba3e5d..6d82813a 100644
--- a/manifests/qpid.pp
+++ b/manifests/qpid.pp
@@ -37,7 +37,7 @@
     $pfx_path               = "${certs::pki_dir}/${qpid_cert_name}.pfx"
     $nssdb_files            = ["${::certs::nss_db_dir}/cert8.db", "${::certs::nss_db_dir}/key3.db", "${::certs::nss_db_dir}/secmod.db"]
 
-    Package['httpd'] -> Package['qpid-cpp-server'] ->
+    Package['qpid-cpp-server'] ->
     Cert[$qpid_cert_name] ~>
     pubkey { $client_cert:
       key_pair => Cert["${::certs::qpid::hostname}-qpid-broker"],
@@ -48,13 +48,13 @@
     file { $client_key:
       ensure => file,
       owner  => 'root',
-      group  => 'apache',
+      group  => $::certs::qpidd_group,
       mode   => '0440',
     } ~>
     file { $::certs::nss_db_dir:
       ensure => directory,
       owner  => 'root',
-      group  => $certs::qpidd_group,
+      group  => $::certs::qpidd_group,
       mode   => '0755',
     } ~>
     exec { 'generate-nss-password':
@@ -65,7 +65,7 @@
     file { $nss_db_password_file:
       ensure => file,
       owner  => 'root',
-      group  => $certs::qpidd_group,
+      group  => $::certs::qpidd_group,
       mode   => '0640',
     } ~>
     exec { 'create-nss-db':
@@ -81,7 +81,7 @@
     } ~>
     file { $nssdb_files:
       owner => 'root',
-      group => $certs::qpidd_group,
+      group => $::certs::qpidd_group,
       mode  => '0640',
     } ~>
     certs::ssltools::certutil { 'broker':