opendev/puppet-storyboard
Code Issues Proposed changes

Move cert/key paths into the cert class

Browse Source 
The snakeoil fallback defaults need to be set in the cert class,
not as defaults in the module init.

Change-Id: Id1f5dd081fa085775b96c0e374055aded203148a
Depends-On: Ifc92d78f081fc69d804c29033e96e1c94462213b
This commit is contained in:
Jeremy Stanley 2016-05-18 15:31:24 +00:00
parent 9fe15d9067
commit edfb6b3bef
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/cert.pp
View File

@ -21,10 +21,10 @@
#
class storyboard::cert (
$ssl_cert_content = undef,
$ssl_cert = '/etc/ssl/certs/storyboard.pem',
$ssl_cert = '/etc/ssl/certs/ssl-cert-snakeoil.pem',
$ssl_key_content = undef,
$ssl_key = '/etc/ssl/private/storyboard.key',
$ssl_key = '/etc/ssl/private/ssl-cert-snakeoil.key',
$ssl_ca_content = undef,
$ssl_ca = undef, # '/etc/ssl/certs/ca.pem'

4
manifests/init.pp
View File

@ -33,9 +33,9 @@ class storyboard (
$openid_url = 'https://login.launchpad.net/+openid',
$ssl_cert_content = undef,
$ssl_cert = '/etc/ssl/certs/ssl-cert-snakeoil.pem',
$ssl_cert = undef,
$ssl_key_content = undef,
$ssl_key = '/etc/ssl/private/ssl-cert-snakeoil.key',
$ssl_key = undef,
$ssl_ca_content = undef,
$ssl_ca = undef,
) {