Merge pull request #2301 from martin-koerner/master

Allow RewriteInherit with empty rewrites

Author: david22swan

manifests/vhost.pp

@@ -2514,11 +2514,12 @@
 
   # Template uses:
   # - $rewrites
+  # - $rewrite_inherit
   # - $rewrite_base
   # - $rewrite_rule
   # - $rewrite_cond
   # - $rewrite_map
-  if (! empty($rewrites) or $rewrite_rule) and $ensure == 'present' {
+  if (! empty($rewrites) or $rewrite_rule or $rewrite_inherit) and $ensure == 'present' {
     include apache::mod::rewrite
 
     concat::fragment { "${name}-rewrite":

spec/defines/vhost_spec.rb

@@ -1708,10 +1708,33 @@
             it { is_expected.to raise_error(Puppet::Error) }
           end
           context 'empty rewrites' do
-            let(:params) { super().merge('rewrites' => []) }
+            let(:params) do
+              super().merge(
+                'rewrite_inherit' => false,
+                'rewrites' => [],
+              )
+            end
 
-            it { is_expected.to compile }
+            it {
+              is_expected.to compile
+              is_expected.not_to contain_concat__fragment('rspec.example.com-rewrite')
+            }
           end
+          context 'empty rewrites_with_rewrite_inherit' do
+            let(:params) do
+              super().merge(
+                'rewrite_inherit' => true,
+                'rewrites' => [],
+              )
+            end
+
+            it {
+              is_expected.to contain_concat__fragment('rspec.example.com-rewrite').with(
+                content: %r{^\s+RewriteOptions Inherit$},
+              )
+            }
+          end
+
           context 'bad error_log_format flag' do
             let :params do
               super().merge(