From 8970d37475bf58fd6896ef80a4190d3ea73a8a72 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 14 Nov 2018 13:52:05 +0100
Subject: [PATCH] - removed rest of prosody/metronome xmpp code

---
 install/apps/metronome-init        | 75 ------------------------------
 install/install.php                |  1 -
 install/lib/installer_base.lib.php |  2 -
 3 files changed, 78 deletions(-)
 delete mode 100644 install/apps/metronome-init

diff --git a/install/apps/metronome-init b/install/apps/metronome-init
deleted file mode 100644
index 19e0a19c08..0000000000
--- a/install/apps/metronome-init
+++ /dev/null
@@ -1,75 +0,0 @@
-#! /bin/sh
-#
-# metronome        Start/stop metronome server
-#
-
-### BEGIN INIT INFO
-# Provides:          metronome
-# Required-Start:    $remote_fs $network $named $time
-# Required-Stop:     $remote_fs $network $named $time
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Starts metronome server
-# Description:       Starts metronome server, an XMPP server written in Lua.
-### END INIT INFO
-
-METRONOME=/usr/bin/metronomectl
-PIDDIR=/var/run/metronome
-NAME=metronome
-
-test -e $METRONOME || exit 0
-
-start()
-{
-        mkdir $PIDDIR -p
-        chown metronome:metronome $PIDDIR
-        chmod 750 $PIDDIR
-
-    $METRONOME start >> /dev/null
-}
-
-stop()
-{
-    $METRONOME stop >> /dev/null
-}
-
-reload()
-{
-    $METRONOME reload >> /dev/null
-}
-
-restart()
-{
-    $METRONOME restart >> /dev/null
-}
-
-case "$1" in
-    start)
-        echo -n "Starting Metronome..."
-        start &
-    ;;
-    stop)
-        echo -n "Stopping Metronome..."
-        stop &
-    ;;
-    reload)
-        echo -n "Reloading Metronome config..."
-        reload &
-    ;;
-    restart)
-        echo -n "Restarting Metronome..."
-        restart &
-    ;;
-    *)
-        echo "Usage: $0 {start|stop|reload|restart}" >&2
-        exit 1
-    ;;
-esac
-
-if [ $? -eq 0 ]; then
-    echo .
-else
-    echo " failed!"
-fi
-
-exit 0
diff --git a/install/install.php b/install/install.php
index 1199dedabc..934d595a5d 100644
--- a/install/install.php
+++ b/install/install.php
@@ -576,7 +576,6 @@ if($conf['bind']['installed'] == true && $conf['bind']['init_script'] != '') sys
 //if($conf['squid']['installed'] == true && $conf['squid']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['squid']['init_script']))     system($conf['init_scripts'].'/'.$conf['squid']['init_script'].' restart &> /dev/null');
 if($conf['nginx']['installed'] == true && $conf['nginx']['init_script'] != '') system($inst->getinitcommand($conf['nginx']['init_script'], 'restart').' &> /dev/null');
 if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '') system($inst->getinitcommand($conf['ufw']['init_script'], 'restart').' &> /dev/null');
-if($conf['metronome']['installed'] == true && $conf['metronome']['init_script'] != '') system($inst->getinitcommand($conf['metronome']['init_script'], 'restart').' &> /dev/null');
 
 //* test tRNG
 if($conf['tRNG']) tRNG();
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 3a7a4ebea0..f25c4eb1f2 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -172,8 +172,6 @@ class installer_base {
 			$conf['firewall']['installed'] = true;
 		}
 		if(is_installed('fail2ban-server')) $conf['fail2ban']['installed'] = true;
-        if(is_installed('metronome') && is_installed('metronomectl')) $conf['metronome']['installed'] = true;
-        if(is_installed('prosody') && is_installed('prosodyctl')) $conf['prosody']['installed'] = true;
 		if(is_installed('spamassassin')) $conf['spamassassin']['installed'] = true;
 		// if(is_installed('vlogger')) $conf['vlogger']['installed'] = true;
 		// ISPConfig ships with vlogger, so it is always installed.
-- 
GitLab