summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2012-08-14 00:01:04 +0200
committervarac <varacanero@zeromail.org>2012-08-14 00:01:04 +0200
commit8d8ef7b1965bd0c72e2755da71d3cbcc9e4d09ad (patch)
tree1a632db55c381aa199fdb9a18b6b1859638acb0f
parent04d8317eb5b70aba62c2b18f6b1bd1d03aedeb5b (diff)
debian specific config.ru location for use with puppetmaster-passenger package
-rw-r--r--manifests/puppetmaster/passenger.pp30
1 files changed, 21 insertions, 9 deletions
diff --git a/manifests/puppetmaster/passenger.pp b/manifests/puppetmaster/passenger.pp
index c4bc062..37f4fef 100644
--- a/manifests/puppetmaster/passenger.pp
+++ b/manifests/puppetmaster/passenger.pp
@@ -7,14 +7,26 @@ class puppet::puppetmaster::passenger inherits puppet::puppetmaster::base {
# A reference configuration is available at :
# http://github.com/reductivelabs/puppet/tree/master/ext/rack
- file {
- ['/etc/puppet/rack', '/etc/puppet/rack/public', '/etc/puppet/rack/tmp']:
- ensure => directory,
- owner => root, group => 0, mode => 0755;
+ case $operatingsystem {
+ debian: {
+ package { 'puppetmaster-passenger': ensure => installed }
+ file {
+ '/usr/share/puppet/rack/puppetmasterd/config.ru':
+ source => [ 'puppet:///modules/site-puppet/master/config.ru',
+ 'puppet:///modules/puppet/master/config.ru' ],
+ owner => puppet, group => 0, mode => '0644';
+ }
+ }
+ default: {
+ file {
+ ['/etc/puppet/rack', '/etc/puppet/rack/public', '/etc/puppet/rack/tmp']:
+ ensure => directory,
+ owner => root, group => 0, mode => '0755';
- '/etc/puppet/rack/config.ru':
- source => [ "puppet:///modules/site-puppet/master/config.ru",
- "puppet:///modules/puppet/master/config.ru" ],
- owner => puppet, group => 0, mode => 0644;
- }
+ '/etc/puppet/rack/config.ru':
+ source => [ 'puppet:///modules/site-puppet/master/config.ru',
+ 'puppet:///modules/puppet/master/config.ru' ],
+ owner => puppet, group => 0, mode => '0644';
+ }
+ }
}