diff options
author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-02-24 14:34:39 -0500 |
---|---|---|
committer | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-02-24 14:38:39 -0500 |
commit | 0bb70b28a7c7679d0e07fd75230d40203c0d53b5 (patch) | |
tree | acd91c59fea86768f81d98e262ed1677f646fa47 /manifests/puppetmaster/passenger.pp | |
parent | beae5a608dd1b1d370917896d853a6b53ad73a45 (diff) | |
parent | 8584340c2aeac7d97a78b8303ab377b5049b80c2 (diff) |
Merge branch 'master' of git://git.puppet.immerda.ch/module-puppet
Conflicts:
files/master/config.ru
files/master/puppet.conf
manifests/base.pp
manifests/centos.pp
manifests/cron.pp
manifests/cron/base.pp
manifests/cron/linux.pp
manifests/debian.pp
manifests/init.pp
manifests/linux.pp
manifests/master/linux.pp
manifests/master/package/debian.pp
manifests/puppetmaster/base.pp
manifests/puppetmaster/centos.pp
manifests/puppetmaster/checklastrun.pp
manifests/puppetmaster/checklastrun/disable.pp
manifests/puppetmaster/cleanup_reports.pp
manifests/puppetmaster/cleanup_reports/disable.pp
manifests/puppetmaster/debian.pp
manifests/puppetmaster/package.pp
manifests/puppetmaster/package/base.pp
manifests/puppetmaster/passenger.pp
Diffstat (limited to 'manifests/puppetmaster/passenger.pp')
-rw-r--r-- | manifests/puppetmaster/passenger.pp | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/manifests/puppetmaster/passenger.pp b/manifests/puppetmaster/passenger.pp deleted file mode 100644 index 4361412..0000000 --- a/manifests/puppetmaster/passenger.pp +++ /dev/null @@ -1,52 +0,0 @@ -# class to use passenger for serving puppetmaster - -class puppet::puppetmaster::passenger inherits puppet::puppetmaster::base { - - include ::passenger - - # A reference configuration is available at : - # http://github.com/reductivelabs/puppet/tree/master/ext/rack - - 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'; - } - - if !defined('apt') { - include apt - } - - $puppet_passenger_snippet = $puppetmaster_ensure_version ? { - undef => absent, - default => present, - } - - apt::preferences_snippet { - 'puppet_passenger': - ensure => $puppet_passenger_snippet, - package => 'puppet*', - pin => "version $puppetmaster_ensure_version", - priority => 2000, - notify => Exec['refresh_apt'], - before => Package['puppetmaster']; - } - } - 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'; - } - } - } -} |