From 7a98903b42ff1f12656a24e229fc37958608f0c1 Mon Sep 17 00:00:00 2001
From: Travis Fields <travis@puppetlabs.com>
Date: Wed, 10 Sep 2014 10:33:29 -0700
Subject: [PATCH 1/2] Fix issue with puppet_module_install, removed and using
 updated method from beaker core copy_module_to

---
 spec/spec_helper_acceptance.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 370de46c0..0ae9335f6 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -28,8 +28,8 @@
   # Configure all nodes in nodeset
   c.before :suite do
     # Install module and dependencies
-    puppet_module_install(:source => proj_root, :module_name => 'apache')
     hosts.each do |host|
+      copy_module_to(host, :source => proj_root, :module_name => 'apache')
       # Required for mod_passenger tests.
       if fact('osfamily') == 'RedHat'
         on host, puppet('module','install','stahnma/epel'), { :acceptable_exit_codes => [0,1] }

From 0d39322210794f9164b1f07821632cab2adec6d9 Mon Sep 17 00:00:00 2001
From: Travis Fields <travis@puppetlabs.com>
Date: Tue, 16 Sep 2014 15:38:52 -0700
Subject: [PATCH 2/2] MODULES-1294 Fix issue with auth_require not taking
 precedence over default of require all granted, added checks for require and
 auth_require before adding the default

---
 templates/vhost/_directories.erb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
index efa26ce4e..b39d636f7 100644
--- a/templates/vhost/_directories.erb
+++ b/templates/vhost/_directories.erb
@@ -37,7 +37,11 @@
     <%- if @apache_version == '2.4' -%>
       <%- if directory['require'] and directory['require'] != '' -%>
     Require <%= Array(directory['require']).join(' ') %>
-      <%- else -%>
+      <%- end -%>
+      <%- if directory['auth_require'] -%>
+    Require <%= directory['auth_require'] %>
+      <%- end -%>
+      <%- if !(directory['require'] and directory['require'] != '') && !(directory['auth_require']) -%>
     Require all granted
       <%- end -%>
     <%- else -%>
@@ -127,9 +131,6 @@
     <%- if directory['auth_group_file'] -%>
     AuthGroupFile <%= directory['auth_group_file'] %>
     <%- end -%>
-    <%- if directory['auth_require'] -%>
-    Require <%= directory['auth_require'] %>
-    <%- end -%>
     <%- if directory['fallbackresource'] -%>
     FallbackResource <%= directory['fallbackresource'] %>
     <%- end -%>