From c3189ce6c7301c3ec17878fd3918f31d0d3cb18a Mon Sep 17 00:00:00 2001 From: Marius Burkard <m.burkard@pixcept.de> Date: Wed, 04 May 2016 07:27:53 -0400 Subject: [PATCH] Merge branch 'stable-3.1' --- install/lib/installer_base.lib.php | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index 5794355..334a16b 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -1630,7 +1630,7 @@ caselog('chmod u+x /etc/init.d/metronome', __FILE__, __LINE__); caselog('update-rc.d metronome defaults', __FILE__, __LINE__); - exec($this->getinitcommand('xmpp', 'restart')); + exec($this->getinitcommand($conf['xmpp']['init_script'], 'restart')); /* writing new private key to 'smtpd.key' @@ -1842,12 +1842,14 @@ public function configure_ufw_firewall() { - $configfile = 'ufw.conf'; - if(is_file('/etc/ufw/ufw.conf')) copy('/etc/ufw/ufw.conf', '/etc/ufw/ufw.conf~'); - $content = rf("tpl/".$configfile.".master"); - wf('/etc/ufw/ufw.conf', $content); - exec('chmod 600 /etc/ufw/ufw.conf'); - exec('chown root:root /etc/ufw/ufw.conf'); + if($this->is_update == false) { + $configfile = 'ufw.conf'; + if(is_file('/etc/ufw/ufw.conf')) copy('/etc/ufw/ufw.conf', '/etc/ufw/ufw.conf~'); + $content = rf("tpl/".$configfile.".master"); + wf('/etc/ufw/ufw.conf', $content); + exec('chmod 600 /etc/ufw/ufw.conf'); + exec('chown root:root /etc/ufw/ufw.conf'); + } } public function configure_bastille_firewall() { -- Gitblit v1.9.1