From edec924d32230070f1d8ef1e914138425faa523b Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.com>
Date: Wed, 5 Dec 2018 17:09:39 +0000
Subject: [PATCH] (FM-7605) Disabling conf_enabled on Ubuntu 18.04 by default
 as it conflicts with Shibboleth, causing errors with apache2

---
 manifests/params.pp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index df65e73d92..06f3adf27a 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -218,7 +218,12 @@
     $server_root         = '/etc/apache2'
     $conf_dir            = $httpd_dir
     $confd_dir           = "${httpd_dir}/conf.d"
-    $conf_enabled        = "${httpd_dir}/conf-enabled"
+    if ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '18.04') == 0) {
+      # Overwrite conf_enabled to be false as it causes errors with Shibboleth when enabled on Ubuntu 18.04
+      $conf_enabled      = undef
+    } else {
+      $conf_enabled      = "${httpd_dir}/conf-enabled"
+    }
     $mod_dir             = "${httpd_dir}/mods-available"
     $mod_enable_dir      = "${httpd_dir}/mods-enabled"
     $vhost_dir           = "${httpd_dir}/sites-available"