tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ejabberd: Add option to disable room logging by default

Browse source
This commit is contained in:
Ossi Salmi 2016-04-13 10:15:27 +03:00
parent 7494adf19b
commit 7ab4b0b7aa
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ejabberd/manifests/init.pp
View file

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

2
ejabberd/templates/ejabberd.cfg.erb
View file

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

2
ejabberd/templates/ejabberd.yml.erb
View file

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