opendev/system-config
Code Issues Proposed changes

Align the parameter names for etherpad.

Browse Source 
Change-Id: I3430939968297d0d6c14f4e210bd7601fee1dc38
This commit is contained in:
Monty Taylor 2012-07-22 19:27:39 -05:00
parent 8d34a912a0
commit 4b0d9b27f6
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/site.pp
View File

@ -543,7 +543,10 @@ node 'etherpad.openstack.org' {
} }
include etherpad_lite include etherpad_lite
include etherpad_lite::nginx class { 'etherpad_lite::nginx':
etherpad_crt => hiera('etherpad_crt'),
etherpad_key => hiera('etherpad_key')
}
class { 'etherpad_lite::site': class { 'etherpad_lite::site':
database_password => hiera('etherpad_db_password'), database_password => hiera('etherpad_db_password'),
} }

4
modules/etherpad_lite/manifests/nginx.pp
View File

@ -1,6 +1,8 @@
class etherpad_lite::nginx ( class etherpad_lite::nginx (
$default_server = 'default_server', $default_server = 'default_server',
$server_name = $fqdn $server_name = $fqdn,
$etherpad_crt,
$etherpad_key
) { ) {
package { 'nginx': package { 'nginx':

2
modules/etherpad_lite/templates/eplite.crt.erb
View File

@ -1 +1 @@
<%= cert_file %> <%= etherpad_crt %>

2
modules/etherpad_lite/templates/eplite.key.erb
View File

@ -1 +1 @@
<%= key_file %> <%= etherpad_key %>