Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5

Author: Till Brehm

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');

install/dist/lib/fedora.lib.php

@@ -392,7 +392,6 @@ public function configure_dovecot()
 			'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

install/dist/lib/opensuse.lib.php

@@ -443,7 +443,6 @@ public function configure_dovecot()
 			'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 @@ public function configure_dovecot()
 		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");
 
 	}
 

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');

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');

server/plugins-available/cron_plugin.inc.php

@@ -213,7 +213,7 @@ function _write_crontab() {
 					}
 
 					$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'];
 				}