From 5b2d6fdf85c9725ee6a46526629625ddfbbac074 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Sun, 22 Jul 2012 19:27:39 -0500 Subject: [PATCH] Align the parameter names for etherpad. Change-Id: I3430939968297d0d6c14f4e210bd7601fee1dc38 --- manifests/nginx.pp | 4 +++- templates/eplite.crt.erb | 2 +- templates/eplite.key.erb | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/manifests/nginx.pp b/manifests/nginx.pp index 4b0d5e3..bb7574b 100644 --- a/manifests/nginx.pp +++ b/manifests/nginx.pp @@ -1,6 +1,8 @@ class etherpad_lite::nginx ( $default_server = 'default_server', - $server_name = $fqdn + $server_name = $fqdn, + $etherpad_crt, + $etherpad_key ) { package { 'nginx': diff --git a/templates/eplite.crt.erb b/templates/eplite.crt.erb index b9ce57a..2b2bdcd 100644 --- a/templates/eplite.crt.erb +++ b/templates/eplite.crt.erb @@ -1 +1 @@ -<%= cert_file %> +<%= etherpad_crt %> diff --git a/templates/eplite.key.erb b/templates/eplite.key.erb index 2ba76d2..9f99d02 100644 --- a/templates/eplite.key.erb +++ b/templates/eplite.key.erb @@ -1 +1 @@ -<%= key_file %> +<%= etherpad_key %>