Align the parameter names for etherpad.

Change-Id: I3430939968297d0d6c14f4e210bd7601fee1dc38
2012-07-22 19:27:39 -05:00 · 2012-07-22 19:27:39 -05:00 · 4b0d9b27f6
commit 4b0d9b27f6
parent 8d34a912a0
4 changed files with 9 additions and 4 deletions
--- a/manifests/site.pp
+++ b/manifests/site.pp
@ -543,7 +543,10 @@ node 'etherpad.openstack.org' {
  }

  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':
    database_password => hiera('etherpad_db_password'),
  }
--- a/modules/etherpad_lite/manifests/nginx.pp
+++ b/modules/etherpad_lite/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':
--- a/modules/etherpad_lite/templates/eplite.crt.erb
+++ b/modules/etherpad_lite/templates/eplite.crt.erb
@ -1 +1 @@
-<%= cert_file %>
+<%= etherpad_crt %>
--- a/modules/etherpad_lite/templates/eplite.key.erb
+++ b/modules/etherpad_lite/templates/eplite.key.erb
@ -1 +1 @@
-<%= key_file %>
+<%= etherpad_key %>