Skip to content

Commit 461977b

Browse files
author
Till Brehm
committed
Metronome init fix 2
1 parent d5fb304 commit 461977b

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

install/lib/installer_base.lib.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1630,7 +1630,7 @@ public function configure_xmpp($options = '') {
16301630
caselog('chmod u+x /etc/init.d/metronome', __FILE__, __LINE__);
16311631
caselog('update-rc.d metronome defaults', __FILE__, __LINE__);
16321632

1633-
exec($this->getinitcommand('xmpp', 'restart'));
1633+
exec($this->getinitcommand('metronome', 'restart'));
16341634

16351635
/*
16361636
writing new private key to 'smtpd.key'

install/update.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -526,9 +526,7 @@
526526
}
527527

528528
if($conf['services']['xmpp']) {
529-
//if($conf['xmpp']['installed'] == true && $conf['xmpp']['init_script'] != '') system($inst->getinitcommand($conf['xmpp']['init_script'], 'restart').' &> /dev/null');
530-
// There is no metronome systemd unit at the moment, so we always use the init script.
531-
if($conf['xmpp']['installed'] == true && $conf['xmpp']['init_script'] != '') system('/etc/init.d/metronome restart &> /dev/null');
529+
if($conf['xmpp']['installed'] == true && $conf['xmpp']['init_script'] != '') system($inst->getinitcommand($conf['xmpp']['init_script'], 'restart').' &> /dev/null');
532530
}
533531

534532
if($conf['services']['proxy']) {

0 commit comments

Comments
 (0)