Move Apache 2.2 access parameter tests around

The previous location was testing it on a vhost that's absent. This is
now testing it on the very complex test where it's present. This is
important because in the future the whole directories concat fragment
isn't rendered on absent vhosts.

Author: ekohl

spec/defines/vhost_spec.rb

@@ -171,6 +171,20 @@
                   'set_output_filter' => 'output_filter' },
                 { 'path'              => '/var/www/files/input_filtered',
                   'set_input_filter' => 'input_filter' },
+                {
+                  'path'     => '/var/www/foo',
+                  'provider' => 'files',
+                  'allow'    => 'from 127.0.0.5',
+                  'deny'     => 'from all',
+                  'order'    => 'deny,allow',
+                },
+                {
+                  'path'     => '/var/www/protected-files',
+                  'provider' => 'files',
+                  'allow'    => ['from 127.0.0.1', 'from 127.0.0.2'],
+                  'deny'     => ['from 127.0.0.3', 'from 127.0.0.4'],
+                  'satisfy'  => 'any',
+                },
                 { 'path'     => '/var/www/files',
                   'provider' => 'location',
                   'limit'    => [
@@ -617,6 +631,7 @@
           }
           it { is_expected.to contain_concat__fragment('rspec.example.com-itk') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-fallbackresource') }
+
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-directories')
               .with_content(%r{^\s+<Proxy "\*">$})
@@ -726,6 +741,24 @@
               .with_content(%r{^\s+SSLVerifyClient\soptional$})
               .with_content(%r{^\s+SSLVerifyDepth\s10$})
           }
+          # the following style is only present on Apache 2.2
+          # That is used in SLES 11, RHEL6, Amazon Linux
+          if (facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'].to_i < 7) ||
+             (facts[:os]['name'] == 'Amazon') ||
+             (facts[:os]['name'] == 'SLES' && facts[:os]['release']['major'].to_i < 12)
+            it {
+              is_expected.to contain_concat__fragment('rspec.example.com-directories')
+                .with_content(%r{^\s+Allow from 127\.0\.0\.1$})
+                .with_content(%r{^\s+Allow from 127\.0\.0\.2$})
+                .with_content(%r{^\s+Allow from 127\.0\.0\.5$})
+                .with_content(%r{^\s+Deny from 127\.0\.0\.3$})
+                .with_content(%r{^\s+Deny from 127\.0\.0\.4$})
+                .with_content(%r{^\s+Deny from all$})
+                .with_content(%r{^\s+Satisfy any$})
+                .with_content(%r{^\s+Order deny,allow$})
+            }
+          end
+
           it { is_expected.to contain_concat__fragment('rspec.example.com-additional_includes') }
           it {
             is_expected.to contain_concat__fragment('rspec.example.com-logging')
@@ -1269,23 +1302,6 @@
               'manage_docroot'  => true,
               'logroot'         => '/tmp/logroot',
               'logroot_ensure'  => 'absent',
-              'directories'     => [
-                {
-                  'path'     => '/var/www/files',
-                  'provider' => 'files',
-                  'allow'    => ['from 127.0.0.1', 'from 127.0.0.2'],
-                  'deny'     => ['from 127.0.0.3', 'from 127.0.0.4'],
-                  'satisfy'  => 'any',
-                },
-                {
-                  'path'     => '/var/www/foo',
-                  'provider' => 'files',
-                  'allow'    => 'from 127.0.0.5',
-                  'deny'     => 'from all',
-                  'order'    => 'deny,allow',
-                },
-              ],
-
             }
           end
 
@@ -1318,23 +1334,6 @@
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-itk') }
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-fallbackresource') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-directories') }
-          # the following style is only present on Apache 2.2
-          # That is used in SLES 11, RHEL6, Amazon Linux
-          if (facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'].to_i < 7) ||
-             (facts[:os]['name'] == 'Amazon') ||
-             (facts[:os]['name'] == 'SLES' && facts[:os]['release']['major'].to_i < 12)
-            it {
-              is_expected.to contain_concat__fragment('rspec.example.com-directories')
-                .with_content(%r{^\s+Allow from 127\.0\.0\.1$})
-                .with_content(%r{^\s+Allow from 127\.0\.0\.2$})
-                .with_content(%r{^\s+Allow from 127\.0\.0\.5$})
-                .with_content(%r{^\s+Deny from 127\.0\.0\.3$})
-                .with_content(%r{^\s+Deny from 127\.0\.0\.4$})
-                .with_content(%r{^\s+Deny from all$})
-                .with_content(%r{^\s+Satisfy any$})
-                .with_content(%r{^\s+Order deny,allow$})
-            }
-          end
           it { is_expected.not_to contain_concat__fragment('rspec.example.com-additional_includes') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-logging') }
           it { is_expected.to contain_concat__fragment('rspec.example.com-serversignature') }