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

Added variable for setting ejabberd chatroom log format

Browse source
This commit is contained in:
Ossi Salmi 2012-04-13 15:35:47 +03:00
parent 7254a59146
commit 23e17e32ae
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ejabberd/manifests/init.pp
View file

@ -20,6 +20,9 @@
# $ejabberd_muclog_datadir: # $ejabberd_muclog_datadir:
# Path where to store chatroom logs. Disabled by default. # Path where to store chatroom logs. Disabled by default.
# #
# $ejabberd_muclog_format:
# Chatroom log format. Valid values html or plaintext, defaults to html.
#
class ejabberd { class ejabberd {
include user::system include user::system
@ -32,6 +35,14 @@ class ejabberd {
$ejabberd_admin = [] $ejabberd_admin = []
} }
case $ejabberd_muclog_format {
"": { $ejabberd_muclog_format = "html" }
"html","plaintext": { }
default: {
fail("Invalid value ${ejabberd_muclog_format} for \$ejabberd_muclog_format.")
}
}
package { "ejabberd": package { "ejabberd":
ensure => installed, ensure => installed,
require => [ User["ejabberd"], User["ejabberd"] ], require => [ User["ejabberd"], User["ejabberd"] ],

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

@ -583,6 +583,7 @@ user, host = admin.split("@") -%>
{access_log, muc}, {access_log, muc},
{outdir, "<%= ejabberd_muclog_datadir %>"}, {outdir, "<%= ejabberd_muclog_datadir %>"},
{dirtype, subdirs}, {dirtype, subdirs},
{file_format, <%= ejabberd_muclog_format %>},
{cssfile, false}, {cssfile, false},
{top_link, {"/portal/", "Back to Portal"}} {top_link, {"/portal/", "Back to Portal"}}
]}, ]},