tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

puppet: Fix passenger support on Ubuntu

Browse source 
Ubuntu's passenger doesn't support the PassengerUser and PassengerGroup
options.
This commit is contained in:
Ossi Salmi 2013-11-02 23:59:21 +02:00
parent a87f7d340f
commit b59f221f78
2 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
puppet/manifests/init.pp
View file

@ -283,11 +283,6 @@ class puppet::server::common inherits puppet::client {
default => "puppet-server", default => "puppet-server",
}, },
ensure => installed, ensure => installed,
notify => $::operatingsystem ? {
debian => Exec["stop-puppetmaster"],
ubuntu => Exec["stop-puppetmaster"],
default => undef,
},
before => File["/etc/puppet/puppet.conf"], before => File["/etc/puppet/puppet.conf"],
} }
@ -297,7 +292,7 @@ class puppet::server::common inherits puppet::client {
command => "pkill -u puppet ; true", command => "pkill -u puppet ; true",
path => "/bin:/usr/bin:/sbin:/usr/sbin", path => "/bin:/usr/bin:/sbin:/usr/sbin",
refreshonly => true, refreshonly => true,
before => File["/etc/default/puppetmaster"], subscribe => Package["puppetmaster"],
} }
} }
} }
@ -660,9 +655,15 @@ class puppet::server::passenger {
} }
file { "/var/lib/passenger/puppet/config.ru": file { "/var/lib/passenger/puppet/config.ru":
ensure => present, ensure => present,
mode => "0644", mode => "0444",
owner => "root", owner => $::operatingsystem ? {
group => "root", "ubuntu" => "puppet",
default => "root",
},
group => $::operatingsystem ? {
"ubuntu" => "puppet",
default => "root",
},
source => "/usr/share/puppet/ext/rack/files/config.ru", source => "/usr/share/puppet/ext/rack/files/config.ru",
} }

2
puppet/templates/passenger-httpd.conf.erb
View file

@ -43,8 +43,10 @@ Listen 8140
# Passenger settings # Passenger settings
PassengerEnabled On PassengerEnabled On
<% unless @operatingsystem == 'Ubuntu' -%>
PassengerUser puppet PassengerUser puppet
PassengerGroup puppet PassengerGroup puppet
<% end -%>
PassengerHighPerformance On PassengerHighPerformance On
PassengerMaxRequests 1000 PassengerMaxRequests 1000
PassengerTempDir /var/run/passenger PassengerTempDir /var/run/passenger