From 206392dd67841991ed1d5a53fa12081468757db8 Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Thu, 8 Dec 2011 14:59:09 +0200
Subject: [PATCH] Updated ejabberd.cfg template

 * added default_room_options
 * added support for chatroom logging
---
 ejabberd/manifests/init.pp          |  3 +++
 ejabberd/templates/ejabberd.cfg.erb | 35 +++++++++++++++++++++++------
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/ejabberd/manifests/init.pp b/ejabberd/manifests/init.pp
index 1d50bc2..bed152d 100644
--- a/ejabberd/manifests/init.pp
+++ b/ejabberd/manifests/init.pp
@@ -17,6 +17,9 @@
 #   $ejabberd_ssl_chain:
 #       Path to SSL certificate chain.
 #
+#   $ejabberd_muclog_datadir:
+#       Path where to store chatroom logs. Disabled by default.
+#
 class ejabberd {
 
     if !$ejabberd_hosts {
diff --git a/ejabberd/templates/ejabberd.cfg.erb b/ejabberd/templates/ejabberd.cfg.erb
index 2573011..76c7001 100644
--- a/ejabberd/templates/ejabberd.cfg.erb
+++ b/ejabberd/templates/ejabberd.cfg.erb
@@ -209,7 +209,7 @@ override_acls.
 %%
 %% Default s2s policy for undefined hosts.
 %%
-{s2s_default_policy, deny}.
+{s2s_default_policy, allow}.
 
 %%
 %% Allow or deny communication with specific servers.
@@ -558,13 +558,35 @@ user, host = admin.split("@") -%>
   {mod_muc,      [
 		  %%{host, "conference.@HOST@"},
 		  {access, muc},
-		  {access_create, muc},
-		  {access_persistent, muc},
+		  {access_create, muc_create},
+		  {access_persistent, muc_create},
 		  {access_admin, muc_admin},
-		  {max_user_conferences, 10000},
-		  {max_users, 1000}
+		  {history_size, 100},
+		  {max_users, 1000},
+		  {max_user_conferences, 1000},
+		  {default_room_options,
+		    [ 
+		      {allow_user_invites, true},
+		      {anonymous, false},
+		      {public, false},
+<% if has_variable?("ejabberd_muclog_datadir") -%>
+		      {logging, true}
+<% else -%>
+		      {logging, false}
+<% end -%>
+		    ]
+		  }
 		 ]},
   %%{mod_muc_log,[]},
+<% if has_variable?("ejabberd_muclog_datadir") -%>
+  {mod_muc_log,  [
+		  {access_log, muc},
+		  {outdir, "<%= ejabberd_muclog_datadir %>"},
+		  {dirtype, subdirs},
+		  {cssfile, false},
+		  {top_link, {"/portal/", "Back to Portal"}}
+		 ]},
+<% end -%>
   {mod_offline,  [{access_max_user_messages, max_user_offline_messages}]},
   {mod_privacy,  []},
   {mod_private,  []},
@@ -574,7 +596,7 @@ user, host = admin.split("@") -%>
 		 ]},
   {mod_pubsub,   [ % requires mod_caps
 		  {access_createnode, pubsub_createnode},
-		  {pep_sendlast_offline, false},
+		  {ignore_pep_from_offline, true}, % reduces resource comsumption, but XEP incompliant
 		  {last_item_cache, false},
 		  %%{plugins, ["default", "pep"]}
 		  {plugins, ["flat", "hometree", "pep"]}  % pep requires mod_caps
@@ -591,7 +613,6 @@ user, host = admin.split("@") -%>
 		  %% these Jabber accounts.
 		  %%
 		  %%{registration_watchers, ["admin1@example.org"]},
-
 		  {access, register}
 		 ]},
   {mod_roster,   []},