- removed rest of prosody/metronome xmpp code

Marius Burkard · Marius Burkard · commit 8970d37475bf · 2018-11-14T13:52:05.000+01:00
diff --git a/install/apps/metronome-init b/install/apps/metronome-init
diff --git a/install/install.php b/install/install.php
@@ -576,7 +576,6 @@
 //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
@@ -172,8 +172,6 @@ public function find_installed_apps() {
 			$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.

Original file line number	Diff line number	Diff line change
`@@ -172,8 +172,6 @@ public function find_installed_apps() {`
`172`	`172`	`$conf['firewall']['installed'] = true;`
`173`	`173`	`}`
`174`	`174`	`if(is_installed('fail2ban-server')) $conf['fail2ban']['installed'] = true;`
`175`		`- if(is_installed('metronome') && is_installed('metronomectl')) $conf['metronome']['installed'] = true;`
`176`		`- if(is_installed('prosody') && is_installed('prosodyctl')) $conf['prosody']['installed'] = true;`
`177`	`175`	`if(is_installed('spamassassin')) $conf['spamassassin']['installed'] = true;`
`178`	`176`	`// if(is_installed('vlogger')) $conf['vlogger']['installed'] = true;`
`179`	`177`	`// ISPConfig ships with vlogger, so it is always installed.`