(MODULES-5990) - conf-enabled defaulted to undef

puppetlabs · Jan 3, 2019 · ab23b9f · ab23b9f
1 parent 116c220
commit ab23b9f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -321,12 +321,8 @@
     $server_root         = '/etc/apache2'
     $conf_dir            = $httpd_dir
     $confd_dir           = "${httpd_dir}/conf.d"
-    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"
-    }
+    # Overwrite conf_enabled causes errors with Shibboleth when enabled on Ubuntu 18.04
+    $conf_enabled        = undef #"${httpd_dir}/conf-enabled.d"
     $mod_dir             = "${httpd_dir}/mods-available"
     $mod_enable_dir      = "${httpd_dir}/mods-enabled"
     $vhost_dir           = "${httpd_dir}/sites-available"

diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb
@@ -109,14 +109,14 @@ LogFormat "<%= format -%>" <%= nickname %>
   <%- end -%>
 <% end -%>
 
+<%- if @conf_enabled and scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
+IncludeOptional "<%= @conf_enabled %>/*.conf"
+<%- end -%>
 <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
 IncludeOptional "<%= @confd_dir %>/*.conf"
 <%- else -%>
 Include "<%= @confd_dir %>/*.conf"
 <%- end -%>
-<%- if @conf_enabled and scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-IncludeOptional "<%= @conf_enabled %>/*.conf"
-<%- end -%>
 <% if @vhost_load_dir != @confd_dir -%>
 <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
 IncludeOptional "<%= @vhost_load_dir %>/<%= @vhost_include_pattern %>"