Merge branch 'master' into puppet3

2013-05-08 16:35:12 +03:00 · 2013-05-08 16:35:12 +03:00 · 17654bb71a
commit 17654bb71a
parent c8c5f097b4 e7aa487fc9
7 changed files with 50 additions and 48 deletions
--- a/apache/manifests/init.pp
+++ b/apache/manifests/init.pp
@ -544,7 +544,7 @@ class apache::mod::passenger {
        }
    }

-    file { "/var/lib/passenger":
+    file { [ "/var/lib/passenger", "/var/run/passenger", ]:
        ensure => directory,
        mode   => "0755",
        owner  => "root",