opendev
/
puppet-askbot
Code Issues Proposed changes

Resolve SSL certificate dependency issue 

Refactor resource dependencies of askbot SSL configuration.

Change-Id: Ia4d656f2ef37b81975a2e2bdf0b8267a08ce7fef
This commit is contained in:
Marton Kiss 2015-08-05 19:43:48 +02:00
parent 6f4b10a63a
commit 5d4ae39165
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/config.pp
View File

@ -51,6 +51,7 @@ class askbot::config (
if $site_ssl_enabled {
class { '::askbot::site::ssl':
site_name => $site_name,
site_ssl_cert_file_contents => $site_ssl_cert_file_contents,
site_ssl_key_file_contents => $site_ssl_key_file_contents,
site_ssl_chain_file_contents => $site_ssl_chain_file_contents,

7
manifests/site/ssl.pp
View File

@ -1,6 +1,7 @@
# == Class: askbot::site::ssl
# This class describes the http server's SSL configuration
class askbot::site::ssl (
$site_name,
$site_ssl_cert_file_contents = undef,
$site_ssl_key_file_contents = undef,
$site_ssl_chain_file_contents = undef,
@ -17,7 +18,7 @@ class askbot::site::ssl (
group => 'root',
mode => '0640',
content => $site_ssl_cert_file_contents,
before => Httpd::Vhost[$name],
before => Httpd::Vhost[$site_name],
}
}
@ -28,7 +29,7 @@ class askbot::site::ssl (
group => 'root',
mode => '0640',
content => $site_ssl_key_file_contents,
before => Httpd::Vhost[$name],
before => Httpd::Vhost[$site_name],
}
}
@ -39,7 +40,7 @@ class askbot::site::ssl (
group => 'root',
mode => '0640',
content => $site_ssl_chain_file_contents,
before => Httpd::Vhost[$name],
before => Httpd::Vhost[$site_name],
}
}
}