From aa5dc72b7339bd2221966374b83619906f56c4e6 Mon Sep 17 00:00:00 2001 From: Ricardo Carrillo Cruz Date: Tue, 13 Jan 2015 11:55:23 +0000 Subject: [PATCH] Expose SSL key/cert/chain file parameters in etherpad class signature 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 --- modules/openstack_project/manifests/etherpad.pp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/openstack_project/manifests/etherpad.pp b/modules/openstack_project/manifests/etherpad.pp index 8ab7d04c71..f87e287bcb 100644 --- a/modules/openstack_project/manifests/etherpad.pp +++ b/modules/openstack_project/manifests/etherpad.pp @@ -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,