ejabberd: Add option to disable room logging by default

ejabberd/manifests/init.pp

@@ -31,6 +31,9 @@
 # $muclog_datadir:
 #   Path where to store chatroom logs. Disabled by default.
 #
+# $muclog_default:
+#   Enable room logging by default. Defaults to true.
+#
 # $muclog_format:
 #   Chatroom log format. Valid values html or plaintext.
 #
@@ -74,6 +77,7 @@ class ejabberd(
   $extauth=undef,
   $extauth_cache=false,
   $muclog_datadir=undef,
+  $muclog_default=true,
   $muclog_format='plaintext',
   $ssl_key="${::puppet_ssldir}/private_keys/${::homename}.pem",
   $ssl_cert="${::puppet_ssldir}/certs/${::homename}.pem",

ejabberd/templates/ejabberd.cfg.erb

@@ -558,7 +558,7 @@ user, host = admin.split("@") -%>
 		      {allow_user_invites, true},
 		      {anonymous, false},
 		      {public, false},
-<% if @muclog_datadir -%>
+<% if @muclog_datadir and @muclog_default == true -%>
 		      {logging, true},
 <% else -%>
 		      {logging, false},

ejabberd/templates/ejabberd.yml.erb

@@ -185,7 +185,7 @@ modules:
     default_room_options:
       allow_user_invites: true
       anonymous: false
-<% if @muclog_datadir -%>
+<% if @muclog_datadir and @muclog_default == true -%>
       logging: true
 <% else -%>
       logging: false