opendev/system-config
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2015-01-29 13:42:55 +00:00 committed by Gerrit Code Review
commit 9d2ff48f14
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 (
$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_key_file_contents = '',
$ssl_chain_file_contents = '',
@ -16,9 +19,9 @@ class openstack_project::etherpad (
include etherpad_lite
class { 'etherpad_lite::apache':
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 => $ssl_cert_file,
ssl_key_file => $ssl_key_file,
ssl_chain_file => $ssl_chain_file,
ssl_cert_file_contents => $ssl_cert_file_contents,
ssl_key_file_contents => $ssl_key_file_contents,
ssl_chain_file_contents => $ssl_chain_file_contents,