Project

General

Profile

« Previous | Next » 

Revision 56fa583a

Added by Greg Sutcliffe over 11 years ago

Restart cleanly on changes to vhost/certs
Don't try to generate certs if not using passenger
Add ordering to puppet app_root

View differences:

manifests/server/passenger.pp
Debian,Ubuntu: {
file { '/etc/default/puppetmaster':
content => "START=no\n",
before => Class['puppet::server::install']
before => Class['puppet::server::install'],
}
}
default: {
......
}
}
exec {'generate_ca_cert':
creates => "${puppet::server::ssl_dir}/certs/${::fqdn}.pem",
command => "${puppet::params::puppetca_path}/${puppet::params::puppetca_bin} --generate ${::fqdn}",
require => File["${puppet::dir}/puppet.conf"],
notify => Service['httpd'],
}
file {'puppet_vhost':
path => "${apache::params::configdir}/puppet.conf",
content => template('puppet/server/puppet-vhost.conf.erb'),
......
[$puppet::server::app_root, "${puppet::server::app_root}/public", "${puppet::server::app_root}/tmp"]:
ensure => directory,
owner => $puppet::server::user,
before => Class['apache::install'],
}
$configru_version = $::puppetversion ? {

Also available in: Unified diff