From 15a668717e4df363cc539ab20d9a8e19f5a954c2 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Wed, 13 Aug 2014 19:43:19 -0400
Subject: [PATCH] Fix dependency loop in vhost

Also fix missing backslash from test for rewrites.
---
 manifests/vhost.pp            | 6 ++----
 spec/acceptance/vhost_spec.rb | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 522560d9a9..cc9d837e70 100644
--- 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
index f8e26f7e22..9ecf347751 100644
--- 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]' ],                                                                              }