Added tests and cleaned up the template

xbezdick · Feb 26, 2015 · 0780062 · 0780062
1 parent 7c6199c
commit 0780062
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
@@ -173,10 +173,18 @@
           'access_log_format'           => '%h %l %u %t \"%r\" %>s %b',
           'access_log_env_var'          => '',
           'aliases'                     => '/image',
-          'directories'                 => {
-            'path'     => '/var/www/files',
-            'provider' => 'files',
-          },
+          'directories'                 => [
+            {
+              'path'     => '/var/www/files',
+              'provider' => 'files',
+              'require'  => [ 'valid-user', 'all denied', ],
+            },
+            {
+              'path'     => '/var/www/files',
+              'provider' => 'files',
+              'require'  => 'all granted',
+            },
+          ],
           'error_log'                   => false,
           'error_log_file'              => 'httpd_error_log',
           'error_log_pipe'              => '',
@@ -277,7 +285,7 @@
       let :facts do
         {
           :osfamily               => 'RedHat',
-          :operatingsystemrelease => '6',
+          :operatingsystemrelease => '7',
           :concat_basedir         => '/dne',
           :operatingsystem        => 'RedHat',
           :id                     => 'root',
@@ -328,6 +336,12 @@
       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') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+Require valid-user$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+Require all denied$/ ) }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-directories').with(
+        :content => /^\s+Require all granted$/ ) }
       it { is_expected.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') }

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
@@ -38,8 +38,8 @@
     <%- end -%>
     <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
       <%- if directory['require'] and directory['require'] != '' -%>
-        <%- Array(directory['require']).each do |require| -%>
-    Require <%= require %>
+        <%- Array(directory['require']).each do |req| -%>
+    Require <%= req %>
         <%- end -%>
       <%- end -%>
       <%- if directory['auth_require'] -%>