From 16644e0ad68a5272fdc3052f2ac6b42f03d2c1e0 Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Fri, 19 Jul 2013 18:23:41 +0300
Subject: [PATCH] vsroom: Fixed parameter names

---
 vsroom/manifests/init.pp         | 16 ++++++++++------
 vsroom/templates/config.json.erb |  4 ++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/vsroom/manifests/init.pp b/vsroom/manifests/init.pp
index 45cf372..5d5d9fd 100644
--- a/vsroom/manifests/init.pp
+++ b/vsroom/manifests/init.pp
@@ -2,14 +2,18 @@
 #
 # === Parameters
 #
-#   $vsroom_authurl:
+#   $authurl:
 #       Authentication path. Defaults to "/collab/?action=authcredentials".
 #
-#   $vsroom_boshurl:
+#   $boshurl:
 #       XMPP BOSH path. Defaults to "/bosh/".
 #
-class vsroom($vsroom_authurl="/collab/?action=authcredentials",
-             $vsroom_boshurl="/bosh/") {
+#   $webhosts:
+#       List of vsroom virtual hosts 
+#
+class vsroom($authurl="/collab/?action=authcredentials",
+             $boshurl="/bosh/",
+             $webhosts=undef) {
 
     case $::operatingsystem {
         "centos","redhat": {
@@ -70,13 +74,13 @@ class vsroom($vsroom_authurl="/collab/?action=authcredentials",
         }
     }
 
-    if $vsroom_webhosts {
+    if $webhosts {
         apache::configfile { "vsroom.conf":
             http   => false,
             source => "puppet:///modules/vsroom/vsroom-httpd.conf",
         }
 
-        configwebhost { $vsroom_webhosts:
+        configwebhost { $webhosts:
             htdocs => $htdocs,
         }
     }
diff --git a/vsroom/templates/config.json.erb b/vsroom/templates/config.json.erb
index c6496cd..10aa204 100644
--- a/vsroom/templates/config.json.erb
+++ b/vsroom/templates/config.json.erb
@@ -1,4 +1,4 @@
 {
-    "authUrl": "<%= @vsroom_authurl %>",
-    "boshUrl": "<%= @vsroom_boshurl %>"
+    "authUrl": "<%= @authurl %>",
+    "boshUrl": "<%= @boshurl %>"
 }