opendev/system-config
Code Issues Proposed changes

Expose SSL key/cert/chain file parameters in etherpad class signature

Browse Source 
The etherpad class does not have SSL key/cert/chain file params
exposed in the outer signature, thus preventing applying this manifest
for testing with snakeoil cert/keys on site.pp.

Change-Id: Ica682b82e5dc8f8a8048bdb074925b1f970942ab
This commit is contained in:
Ricardo Carrillo Cruz 2015-01-13 11:55:23 +00:00
parent bb76bc2057
commit aa5dc72b73
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/openstack_project/manifests/etherpad.pp
View File

@ -1,5 +1,8 @@
class openstack_project::etherpad ( class openstack_project::etherpad (
$mysql_password, $mysql_password,
$ssl_cert_file = '/etc/ssl/certs/etherpad.openstack.org.pem',
$ssl_key_file = '/etc/ssl/private/etherpad.openstack.org.key',
$ssl_chain_file = '/etc/ssl/certs/intermediate.pem',
$ssl_cert_file_contents = '', $ssl_cert_file_contents = '',
$ssl_key_file_contents = '', $ssl_key_file_contents = '',
$ssl_chain_file_contents = '', $ssl_chain_file_contents = '',
@ -16,9 +19,9 @@ class openstack_project::etherpad (
include etherpad_lite include etherpad_lite
class { 'etherpad_lite::apache': class { 'etherpad_lite::apache':
ssl_cert_file => '/etc/ssl/certs/etherpad.openstack.org.pem', ssl_cert_file => $ssl_cert_file,
ssl_key_file => '/etc/ssl/private/etherpad.openstack.org.key', ssl_key_file => $ssl_key_file,
ssl_chain_file => '/etc/ssl/certs/intermediate.pem', ssl_chain_file => $ssl_chain_file,
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,
ssl_chain_file_contents => $ssl_chain_file_contents, ssl_chain_file_contents => $ssl_chain_file_contents,