Merge pull request #820 from mhaskel/vhost_fixes

Fix dependency loop in vhost
xbezdick · Aug 14, 2014 · 445fdc7 · 445fdc7
2 parents e48b509 + 15a6687
commit 445fdc7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
@@ -295,6 +295,7 @@
       ensure  => directory,
       mode    => $logroot_mode,
       require => Package['httpd'],
+      before  => File["${priority_real}-${filename}.conf"],
     }
   }
 
@@ -541,10 +542,7 @@
     owner   => 'root',
     group   => $::apache::params::root_group,
     mode    => '0644',
-    require => [
-      Package['httpd'],
-      File[$logroot],
-    ],
+    require => Package['httpd'],
     notify  => Service['httpd'],
   }
   if $::osfamily == 'Debian' {

diff --git a/spec/acceptance/vhost_spec.rb b/spec/acceptance/vhost_spec.rb
@@ -997,7 +997,7 @@ class { 'apache': }
               comment => 'Permalink Rewrites',
               rewrite_base => '/',
               },
-              { rewrite_rule => [ '^index\.php$ - [L]' ] },
+              { rewrite_rule => [ '^index\\.php$ - [L]' ] },
               { rewrite_cond => [
                 '%{REQUEST_FILENAME} !-f',
                 '%{REQUEST_FILENAME} !-d',                                                                                             ],                                                                                                                     rewrite_rule => [ '. /index.php [L]' ],                                                                              }