From 534e45296e926da566cd609f01d7bad564b982a5 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Mon, 05 May 2014 03:47:07 -0400
Subject: [PATCH] Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5
---
install/install.php | 4 +++-
install/dist/lib/fedora.lib.php | 1 -
install/dist/lib/opensuse.lib.php | 3 +--
install/update.php | 6 ++++--
server/plugins-available/cron_plugin.inc.php | 2 +-
install/autoupdate.php | 6 ++++--
6 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/install/autoupdate.php b/install/autoupdate.php
index f9d0e62..8960e13 100644
--- a/install/autoupdate.php
+++ b/install/autoupdate.php
@@ -198,8 +198,10 @@
$inst->configure_postfix('dont-create-certs');
//** Configure mailman
- swriteln('Configuring Mailman');
- $inst->configure_mailman('update');
+ if($conf['mailman']['installed'] == true) {
+ swriteln('Configuring Mailman');
+ $inst->configure_mailman('update');
+ }
//* Configure Jailkit
swriteln('Configuring Jailkit');
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index 753db26..941d1dd 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -392,7 +392,6 @@
'virtual_transport = dovecot',
'smtpd_sasl_type = dovecot',
'smtpd_sasl_path = private/auth',
- 'receive_override_options = no_address_mappings'
);
// Make a backup copy of the main.cf file
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
index 35f60db..192514f 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -443,7 +443,6 @@
'virtual_transport = dovecot',
'smtpd_sasl_type = dovecot',
'smtpd_sasl_path = private/auth',
- 'receive_override_options = no_address_mappings'
);
// Make a backup copy of the main.cf file
@@ -501,7 +500,7 @@
exec("chown root:root $config_dir/$configfile");
// Dovecot shall ignore mounts in website directory
- exec("doveadm mount add '/srv/www/*' ignore");
+ if(is_installed('doveadm')) exec("doveadm mount add '/srv/www/*' ignore > /dev/null 2> /dev/null");
}
diff --git a/install/install.php b/install/install.php
index 847c2fd..796b027 100644
--- a/install/install.php
+++ b/install/install.php
@@ -191,7 +191,9 @@
$inst->configure_postfix();
//* Configure Mailman
- $inst->configure_mailman('install');
+ if($conf['mailman']['installed'] == true) {
+ $inst->configure_mailman('install');
+ }
//* Configure jailkit
swriteln('Configuring Jailkit');
diff --git a/install/update.php b/install/update.php
index 08ffcc8..6a1b9d1 100644
--- a/install/update.php
+++ b/install/update.php
@@ -262,8 +262,10 @@
$inst->configure_postfix('dont-create-certs');
//** Configure mailman
- swriteln('Configuring Mailman');
- $inst->configure_mailman('update');
+ if($conf['mailman']['installed'] == true) {
+ swriteln('Configuring Mailman');
+ $inst->configure_mailman('update');
+ }
//* Configure Jailkit
swriteln('Configuring Jailkit');
diff --git a/server/plugins-available/cron_plugin.inc.php b/server/plugins-available/cron_plugin.inc.php
index 8ea86c3..fe00713 100644
--- a/server/plugins-available/cron_plugin.inc.php
+++ b/server/plugins-available/cron_plugin.inc.php
@@ -213,7 +213,7 @@
}
$command .= "\t";
- if($job['type'] != 'chrooted' && substr($job['command'], 0, 1) != "/") $command .= $this->parent_domain['document_root'].'/';
+ //if($job['type'] != 'chrooted' && substr($job['command'], 0, 1) != "/") $command .= $this->parent_domain['document_root'].'/';
$command .= $job['command'];
}
--
Gitblit v1.9.1