Merge "Fixes in git_backend class"

This commit is contained in:
Jenkins 2015-07-15 22:48:46 +00:00 committed by Gerrit Code Review
commit 0bc1111062

View File

@ -38,8 +38,8 @@ class openstack_project::git_backend (
class { '::cgit': class { '::cgit':
vhost_name => $vhost_name, vhost_name => $vhost_name,
ssl_cert_file => '/etc/pki/tls/certs/${vhost_name}.pem', ssl_cert_file => "/etc/pki/tls/certs/${vhost_name}.pem",
ssl_key_file => '/etc/pki/tls/private/${vhost_name}.key', ssl_key_file => "/etc/pki/tls/private/${vhost_name}.key",
ssl_chain_file => '/etc/pki/tls/certs/intermediate.pem', ssl_chain_file => '/etc/pki/tls/certs/intermediate.pem',
ssl_cert_file_contents => $ssl_cert_file_contents, ssl_cert_file_contents => $ssl_cert_file_contents,
ssl_key_file_contents => $ssl_key_file_contents, ssl_key_file_contents => $ssl_key_file_contents,
@ -101,6 +101,7 @@ class openstack_project::git_backend (
require => [ require => [
File['/home/cgit/projects.yaml'], File['/home/cgit/projects.yaml'],
User['zuul'], User['zuul'],
Class['jeepyb'],
], ],
subscribe => File['/home/cgit/projects.yaml'], subscribe => File['/home/cgit/projects.yaml'],
refreshonly => true, refreshonly => true,