From 164c79ef5283c0feaa5fd1e29f1040258aea0191 Mon Sep 17 00:00:00 2001 From: Ossi Salmi Date: Wed, 31 Aug 2016 13:09:37 +0300 Subject: [PATCH] ejabberd: Make some limits configurable --- ejabberd/manifests/init.pp | 12 ++++++++++++ ejabberd/templates/ejabberd.yml.erb | 8 ++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ejabberd/manifests/init.pp b/ejabberd/manifests/init.pp index d3c1918..4505dc9 100644 --- a/ejabberd/manifests/init.pp +++ b/ejabberd/manifests/init.pp @@ -28,6 +28,15 @@ # Number of seconds that ejabberd can cache external authentication # information. Disabled by default. # +# $max_user_sessions: +# Maximum number of sessions per user. Defaults to 1000. +# +# $max_user_conferences: +# Maximum number of conferences per user. Defaults to 2000. +# +# $muc_max_users: +# Maximum number of users per conference. Defaults to 1000. +# # $muclog_datadir: # Path where to store chatroom logs. Disabled by default. # @@ -76,6 +85,9 @@ class ejabberd( $auth='internal', $extauth=undef, $extauth_cache=false, + $max_user_sessions='1000', + $max_user_conferences='2000', + $muc_max_users='1000', $muclog_datadir=undef, $muclog_default=true, $muclog_format='plaintext', diff --git a/ejabberd/templates/ejabberd.yml.erb b/ejabberd/templates/ejabberd.yml.erb index dc3b2e5..f68f799 100644 --- a/ejabberd/templates/ejabberd.yml.erb +++ b/ejabberd/templates/ejabberd.yml.erb @@ -141,7 +141,7 @@ access: admin: 1000 all: 100 max_user_sessions: - all: 1000 + all: <%= @max_user_sessions %> muc: local: allow muc_admin: @@ -180,8 +180,8 @@ modules: access_create: muc_create access_persistent: muc_create history_size: 100 - max_users: 1000 - max_user_conferences: 2000 + max_users: <%= @muc_max_users %> + max_user_conferences: <%= @max_user_conferences %> default_room_options: allow_user_invites: true anonymous: false @@ -190,7 +190,7 @@ modules: <% else -%> logging: false <% end -%> - max_users: 1000 + max_users: <%= @muc_max_users %> members_by_default: false members_only: true public: false