From eb0fb28ea23d84b5414b69b2a0caec5df783509d Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Fri, 20 Apr 2012 11:34:13 +0300
Subject: [PATCH] Don't touch ejabberd.cfg if ejabberd_muclog_format is not set

---
 ejabberd/manifests/init.pp          | 5 ++---
 ejabberd/templates/ejabberd.cfg.erb | 2 ++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ejabberd/manifests/init.pp b/ejabberd/manifests/init.pp
index 723c09e..c010b83 100644
--- a/ejabberd/manifests/init.pp
+++ b/ejabberd/manifests/init.pp
@@ -21,7 +21,7 @@
 #       Path where to store chatroom logs. Disabled by default.
 #
 #   $ejabberd_muclog_format:
-#       Chatroom log format. Valid values html or plaintext, defaults to html.
+#       Chatroom log format. Valid values html or plaintext.
 #
 class ejabberd {
 
@@ -36,8 +36,7 @@ class ejabberd {
     }
 
     case $ejabberd_muclog_format {
-        "": { $ejabberd_muclog_format = "html" }
-        "html","plaintext": { }
+        "","html","plaintext": { }
         default: {
             fail("Invalid value ${ejabberd_muclog_format} for \$ejabberd_muclog_format.")
         }
diff --git a/ejabberd/templates/ejabberd.cfg.erb b/ejabberd/templates/ejabberd.cfg.erb
index 603b135..1ac3a11 100644
--- a/ejabberd/templates/ejabberd.cfg.erb
+++ b/ejabberd/templates/ejabberd.cfg.erb
@@ -583,7 +583,9 @@ user, host = admin.split("@") -%>
 		  {access_log, muc},
 		  {outdir, "<%= ejabberd_muclog_datadir %>"},
 		  {dirtype, subdirs},
+<% if has_variable?("ejabberd_muclog_format") -%>
 		  {file_format, <%= ejabberd_muclog_format %>},
+<% end -%>
 		  {cssfile, false},
 		  {top_link, {"/portal/", "Back to Portal"}}
 		 ]},