From fdda8edab91726a8199c1b52cb4f97abf82e4ed7 Mon Sep 17 00:00:00 2001
From: Patrick Anders <p.anders@timmehosting.de>
Date: Thu, 11 Dec 2014 10:48:40 -0500
Subject: [PATCH] changed translations see: - http://git.ispconfig.org/panders/ispconfig3/commit/f7ec00b2f8ba3efc5bdeacef9c813f8a826ae3be#note_453 - http://git.ispconfig.org/panders/ispconfig3/commit/f7ec00b2f8ba3efc5bdeacef9c813f8a826ae3be#note_452 - http://git.ispconfig.org/panders/ispconfig3/commit/f7ec00b2f8ba3efc5bdeacef9c813f8a826ae3be#note_450 - http://git.ispconfig.org/panders/ispconfig3/commit/f7ec00b2f8ba3efc5bdeacef9c813f8a826ae3be#note_449
---
install/update.php | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/install/update.php b/install/update.php
index 803e47d..311c070 100644
--- a/install/update.php
+++ b/install/update.php
@@ -342,8 +342,10 @@
$inst->configure_spamassassin();
//** Configure Amavis
- swriteln('Configuring Amavisd');
- $inst->configure_amavis();
+ if($conf['amavis']['installed'] == true) {
+ swriteln('Configuring Amavisd');
+ $inst->configure_amavis();
+ }
//** Configure Getmail
swriteln('Configuring Getmail');
@@ -397,10 +399,15 @@
if($conf['services']['firewall']) {
- if($conf['bastille']['installed'] == true) {
+ if($conf['ufw']['installed'] == true) {
+ //* Configure Ubuntu Firewall
+ $conf['services']['firewall'] = true;
+ swriteln('Configuring Ubuntu Firewall');
+ $inst->configure_ufw_firewall();
+ } else {
//* Configure Bastille Firewall
swriteln('Configuring Bastille Firewall');
- $inst->configure_firewall();
+ $inst->configure_bastille_firewall();
}
}
@@ -456,7 +463,7 @@
//** Restart services:
if($reconfigure_services_answer == 'yes') {
swriteln('Restarting services ...');
- if($conf['mysql']['installed'] == true && $conf['mysql']['init_script'] != '') system($inst->getinitcommand($conf['mysql']['init_script'], 'restart'));
+ if($conf['mysql']['installed'] == true && $conf['mysql']['init_script'] != '') system($inst->getinitcommand($conf['mysql']['init_script'], 'restart').' >/dev/null 2>&1');
if($conf['services']['mail']) {
if($conf['postfix']['installed'] == true && $conf['postfix']['init_script'] != '') system($inst->getinitcommand($conf['postfix']['init_script'], 'restart'));
if($conf['saslauthd']['installed'] == true && $conf['saslauthd']['init_script'] != '') system($inst->getinitcommand($conf['saslauthd']['init_script'], 'restart'));
@@ -493,7 +500,7 @@
}
if($conf['services']['firewall']) {
- //if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['ufw']['init_script'])) system($conf['init_scripts'].'/'.$conf['ufw']['init_script'].' restart &> /dev/null');
+ if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['ufw']['init_script'])) system($conf['init_scripts'].'/'.$conf['ufw']['init_script'].' restart &> /dev/null');
}
}
--
Gitblit v1.9.1