From 3f916ccb6ae7dca534054f1be1e337732b171ed0 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Wed, 01 Apr 2015 05:01:37 -0400
Subject: [PATCH] Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

---
 install/tpl/server.ini.master |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master
index 7805988..20dca2d 100644
--- a/install/tpl/server.ini.master
+++ b/install/tpl/server.ini.master
@@ -145,3 +145,12 @@
 do_not_try_rescue_mysql=n
 do_not_try_rescue_mail=n
 
+[xmpp]
+xmpp_use_ispv6=n
+xmpp_bosh_max_inactivity=30
+xmpp_server_admins=admin@service.com, superuser@service.com
+xmpp_modules_enabled=saslauth, tls, dialback, disco, discoitems, version, uptime, time, ping, admin_adhoc, admin_telnet, bosh, posix, announce, offline, webpresence, mam, stream_management, message_carbons
+xmpp_port_http=5290
+xmpp_port_https=5291
+xmpp_port_pastebin=5292
+xmpp_port_bosh=5280

--
Gitblit v1.9.1