From 5afaf8cb6982ceb4280f6e8c9da6e447c33fd99d Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Sat, 4 May 2013 18:45:09 +0300
Subject: [PATCH] puppet: Set passenger user and group in apache config

---
 puppet/manifests/init.pp                  | 6 +++---
 puppet/templates/passenger-httpd.conf.erb | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/puppet/manifests/init.pp b/puppet/manifests/init.pp
index d94b443..bcd3c49 100644
--- a/puppet/manifests/init.pp
+++ b/puppet/manifests/init.pp
@@ -623,9 +623,9 @@ class puppet::server::passenger {
     }
     file { "/var/lib/passenger/puppet/config.ru":
         ensure => present,
-        mode   => "0444",
-        owner  => "puppet",
-        group  => "puppet",
+        mode   => "0644",
+        owner  => "root",
+        group  => "root",
         source => "/usr/share/puppet/ext/rack/files/config.ru",
     }
 
diff --git a/puppet/templates/passenger-httpd.conf.erb b/puppet/templates/passenger-httpd.conf.erb
index 2f0439a..44be66e 100644
--- a/puppet/templates/passenger-httpd.conf.erb
+++ b/puppet/templates/passenger-httpd.conf.erb
@@ -43,6 +43,8 @@ Listen 8140
 
   # Passenger settings
   PassengerEnabled On
+  PassengerUser puppet
+  PassengerGroup puppet
   PassengerHighPerformance On
   PassengerMaxRequests 1000
   DocumentRoot /var/lib/passenger/puppet/public