summaryrefslogtreecommitdiff
path: root/manifests/master/passenger.pp
diff options
context:
space:
mode:
authorMicah <micah@riseup.net>2015-03-01 00:34:37 +0000
committerMicah <micah@riseup.net>2015-03-01 00:34:37 +0000
commit70d2dd696696b14c5011580f994c6520b028f32a (patch)
treeacd91c59fea86768f81d98e262ed1677f646fa47 /manifests/master/passenger.pp
parentbeae5a608dd1b1d370917896d853a6b53ad73a45 (diff)
parent0bb70b28a7c7679d0e07fd75230d40203c0d53b5 (diff)
Merge branch 'merge_immerda' into 'master'
Merge immerda's changes GENERAL CHANGES * Now uses parameterized classes * Deprecates all top-scope "$puppet_*" variables * File source path changed from "site-puppet" to "site_puppet" master/puppet.conf * [main] default vardir changed /srv/puppet to /var/lib/puppet * [main] plugindest removed * [agent] logdest removed * [environments] removed base.pp * new $puppet::config, $puppet::config_content cron/base.pp * new $puppet::cron::cron_time, $puppet::http_compression, $puppet::cron::stop_service cron.pp * new puppet::cron parameterized class debian.pp * $puppet_ensure_version now $puppet::ensure_version init.pp * new puppet parameteried class * $use_shorewall deprecated linux.pp * $facter_ensure_version now $puppet::facter_ensure_version master/linux.pp * $puppetmaster_mode changed to $puppet::master::mode * does not require apache::base master * class puppet:puppetmaster::* renamed puppet::master::* * $puppet_fileserverconfig changed to $puppet::master::fileserver * added $puppet::master::config_content * $puppetmaster_storeconfigs changed to $puppet::master::storeconfigs master/lastruncheck.pp * $::puppet_lastruncheck_ignorehosts changed to $puppet::master::lastruncheck_ignorehosts * $::puppet_lastruncheck_ignorehosts_str changed to $puppet::master::lastruncheck_ignorehosts_str * $::puppet_lastruncheck_timeout_str changed to $puppet::master::lastruncheck_timeout_str * does not include cron * /etc/cron.d/puppetlast command changed master/cleanupreports * $puppetmaster_cleanup_reports[_dir] changed to $puppet::master::reports[_dir] * cron filename changed master/passenger * does not install puppetmaster-passenger package on Debian anymore * restart mechanism by creating /etc/puppet/rack/tmp/restart.txt * does not manage /usr/share/puppet/rack/puppetmasterd/config.ru anymore, config.ru expected at /etc/puppet/rack (check your Apache configs) See merge request !1
Diffstat (limited to 'manifests/master/passenger.pp')
-rw-r--r--manifests/master/passenger.pp26
1 files changed, 26 insertions, 0 deletions
diff --git a/manifests/master/passenger.pp b/manifests/master/passenger.pp
new file mode 100644
index 0000000..cf90b1d
--- /dev/null
+++ b/manifests/master/passenger.pp
@@ -0,0 +1,26 @@
+# class to use passenger for serving puppetmaster
+class puppet::master::passenger inherits puppet::master {
+
+ include ::passenger
+
+ # A reference configuration is available at :
+ # http://github.com/reductivelabs/puppet/tree/master/ext/rack
+ file {
+ ['/etc/puppet/rack', '/etc/puppet/rack/public' ]:
+ ensure => directory,
+ owner => root,
+ group => 0,
+ mode => '0755';
+ '/etc/puppet/rack/tmp':
+ ensure => directory,
+ owner => puppet,
+ group => 0,
+ mode => '0750';
+ '/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';
+ }
+}