From a3c0017a1ad41ed8098d694b2e85d6a6e93c83f9 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Fri, 6 Jan 2017 22:25:02 +0100
Subject: [PATCH] Use apache mod classes

Requires https://github.com/puppetlabs/puppetlabs-apache/pull/1588
---
 manifests/config/passenger.pp |  7 +++++++
 manifests/install.pp          | 21 +++------------------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/manifests/config/passenger.pp b/manifests/config/passenger.pp
index 578e76137..2ca0b120a 100644
--- a/manifests/config/passenger.pp
+++ b/manifests/config/passenger.pp
@@ -113,6 +113,13 @@
   include ::apache::mod::headers
   include ::apache::mod::passenger
 
+  if $::foreman::ipa_authentication {
+    include ::apache::mod::authnz_pam
+    include ::apache::mod::intercept_form_submit
+    include ::apache::mod::lookup_identity
+    include ::apache::mod::auth_kerb
+  }
+
   if $use_vhost {
     # Check the value in case the interface doesn't exist, otherwise listen on all interfaces
     if $listen_on_interface and $listen_on_interface in split($::interfaces, ',') {
diff --git a/manifests/install.pp b/manifests/install.pp
index f12d5307a..eae1ad196 100644
--- a/manifests/install.pp
+++ b/manifests/install.pp
@@ -37,24 +37,9 @@
     }
   }
 
-  if $::foreman::ipa_authentication {
-    case $::osfamily {
-      'RedHat': {
-        # The apache::mod's need to be in install to break circular dependencies
-        ::apache::mod { 'authnz_pam': package => 'mod_authnz_pam' }
-        ::apache::mod { 'intercept_form_submit': package => 'mod_intercept_form_submit' }
-        ::apache::mod { 'lookup_identity': package => 'mod_lookup_identity' }
-        include ::apache::mod::auth_kerb
-      }
-      default: {
-        fail("${::hostname}: ipa_authentication is not supported on osfamily ${::osfamily}")
-      }
-    }
-
-    if $::foreman::ipa_manage_sssd {
-      package { 'sssd-dbus':
-        ensure => installed,
-      }
+  if $::foreman::ipa_authentication and $::foreman::ipa_manage_sssd {
+    package { 'sssd-dbus':
+      ensure => installed,
     }
   }
 }