Fix zuul-ci.org website def
We should use {} in templated strings to avoid confusion about variable names. Also, make sure the required cert files are in place before trying to create a vhost. Change-Id: I24ef5ffe347a4a389acb282ea3a41b87fb34f6bc
This commit is contained in:
parent
7b95ffd4a3
commit
c03b2df2ac
@ -28,9 +28,12 @@ define openstack_project::website (
|
|||||||
docroot => "${afs_root}/project/${name}/www",
|
docroot => "${afs_root}/project/${name}/www",
|
||||||
priority => '50',
|
priority => '50',
|
||||||
template => $template,
|
template => $template,
|
||||||
|
require => [File["/etc/ssl/certs/${name}.pem"],
|
||||||
|
File["/etc/ssl/private/${name}.key"],
|
||||||
|
File["/etc/ssl/certs/${name}_intermediate.pem"]],
|
||||||
}
|
}
|
||||||
|
|
||||||
file { "/etc/ssl/certs/$name.pem":
|
file { "/etc/ssl/certs/${name}.pem":
|
||||||
ensure => present,
|
ensure => present,
|
||||||
owner => 'root',
|
owner => 'root',
|
||||||
group => 'root',
|
group => 'root',
|
||||||
@ -39,7 +42,7 @@ define openstack_project::website (
|
|||||||
require => File['/etc/ssl/certs'],
|
require => File['/etc/ssl/certs'],
|
||||||
}
|
}
|
||||||
|
|
||||||
file { "/etc/ssl/private/$name.key":
|
file { "/etc/ssl/private/${name}.key":
|
||||||
ensure => present,
|
ensure => present,
|
||||||
owner => 'root',
|
owner => 'root',
|
||||||
group => 'root',
|
group => 'root',
|
||||||
@ -48,7 +51,7 @@ define openstack_project::website (
|
|||||||
require => File['/etc/ssl/private'],
|
require => File['/etc/ssl/private'],
|
||||||
}
|
}
|
||||||
|
|
||||||
file { "/etc/ssl/certs/$name_intermediate.pem":
|
file { "/etc/ssl/certs/${name}_intermediate.pem":
|
||||||
ensure => present,
|
ensure => present,
|
||||||
owner => 'root',
|
owner => 'root',
|
||||||
group => 'root',
|
group => 'root',
|
||||||
|
Loading…
Reference in New Issue
Block a user