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/dist/conf/debian60.conf.php |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/install/dist/conf/debian60.conf.php b/install/dist/conf/debian60.conf.php
index a381996..e18faa4 100644
--- a/install/dist/conf/debian60.conf.php
+++ b/install/dist/conf/debian60.conf.php
@@ -222,5 +222,9 @@
 $conf['cron']['crontab_dir'] = '/etc/cron.d';
 $conf['cron']['wget'] = '/usr/bin/wget';
 
+//* Metronome XMPP
+$conf['xmpp']['installed'] = false;
+$conf['xmpp']['init_script'] = 'metronome';
+
 
 ?>

--
Gitblit v1.9.1