Project

General

Profile

« Previous | Next » 

Revision 47679372

Added by Dominic Cleal over 7 years ago

fixes #17062 - move master rack restart to puppet::server::service

Includes minor changes to containment of server configuration classes
to ensure notifies of changes from puppet::server::passenger and ::rack
all reach puppet::server::service.

View differences:

manifests/server/rack.pp
# include puppet::server::rack
#
class puppet::server::rack(
$app_root = $::puppet::server::app_root,
$confdir = $::puppet::server::dir,
$rack_arguments = $::puppet::server::rack_arguments,
$user = $::puppet::server::user,
$vardir = $::puppet::vardir,
$app_root = $::puppet::server::passenger::app_root,
$confdir = $::puppet::server::passenger::confdir,
$rack_arguments = $::puppet::server::passenger::rack_arguments,
$user = $::puppet::server::passenger::user,
$vardir = $::puppet::server::passenger::vardir,
) {
exec {'puppet_server_rack-restart':
command => "touch ${app_root}/tmp/restart.txt",
cwd => $app_root,
path => '/bin:/usr/bin',
refreshonly => true,
require => [
Class['puppet::server::install'],
File["${app_root}/tmp"]
],
}
file {
[$app_root, "${app_root}/public", "${app_root}/tmp"]:
ensure => directory,
......
mode => '0755',
}
file {
"${app_root}/config.ru":
owner => $user,
content => template('puppet/server/config.ru.erb'),
notify => Exec['puppet_server_rack-restart'],
file { "${app_root}/config.ru":
owner => $user,
content => template('puppet/server/config.ru.erb'),
}
}

Also available in: Unified diff