- fixed rspamd settings

ispc3-ai.sh

@@ -63,4 +63,3 @@ else
 fi
 
 cd ${CURDIR} ;
-rm -rf /tmp/ispconfig-ai ;
\ No newline at end of file

lib/class.ISPConfig.inc.php

@@ -181,6 +181,7 @@ Possible arguments are:
 					->"stable" is the latest ISPConfig release available on www.ispconfig.org
 					->"dev" is the latest stable-branch from the ISPConfig git repository: https://git.ispconfig.org/ispconfig/ispconfig3/tree/stable-3.1
 					-> The dev channel might contain bugs and less-tested features and should only be used in production by very experienced users.
+	--lang			->Use language for ISPConfig installation. Specify with --lang=en|de (only en (English) and de (German) supported currently).
 	--interactive	->Don\'t install ISPConfig in non-interactive mode. This is needed if you want to use expert mode, e. g. to install a slave server that shall be integrated into an existing multiserver setup.
 	--use-nginx		->Use nginx webserver instead of apache2
 	--no-web		->Do not use ISPConfig on this server to manage webserver setting and don\'t install nginx/apache or pureftpd. This will also prevent installing an ISPConfig UI and implies --no-roundcube as well as --no-pma
@@ -206,7 +207,7 @@ Possible arguments are:
 		
 		$valid_args = array(
 			'help', 'debug', 'interactive',
-			'use-nginx', 'channel',
+			'use-nginx', 'channel', 'lang',
 			'no-web', 'no-mail', 'no-dns', 'no-firewall', 'no-roundcube', 'no-pma', 'no-mailman',
 			'i-know-what-i-am-doing'
 		);
@@ -225,6 +226,9 @@ Possible arguments are:
 		} elseif(isset($_GET['channel']) && !in_array($_GET['channel'], array('stable', 'dev'), true)) {
 			self::printHelp();
 			exit;
+		} elseif(isset($_GET['lang']) && !in_array($_GET['lang'], array('de', 'en'), true)) {
+			self::printHelp();
+			exit;
 		}
 		
 		if(!isset($_GET['i-know-what-i-am-doing']) || !$_GET['i-know-what-i-am-doing']) {
@@ -250,10 +254,15 @@ Possible arguments are:
 				exit;
 			}
 			
+			if(!isset($_GET['channel']) || $_GET['channel'] !== 'dev') {
+				ISPConfigLog::info('<lightred>NOTE:</lightred> Installing ISPConfig stable is not supported until 3.1.15 release (due to rspamd support). Please use --channel=dev to install stable-3.1 git development branch.', true);
+				exit;
+			}
+			
 			ISPConfigLog::info('Starting perfect server setup for ' . $os['NAME'], true);
 			$installer = ISPConfigBaseOS::getOSInstance();
 			$installer->runPerfectSetup();
-			ISPConfigLog::info('<lightred>Warning:</lightred> Please delete the log files in var/log/setup-* once you don\'t need them anymore because they contain your passwords!', true);
+			ISPConfigLog::info('<lightred>Warning:</lightred> Please delete the log files in ' . LOG_DIR . '/setup-* once you don\'t need them anymore because they contain your passwords!', true);
 		} catch(Exception $ex) {
 			throw $ex;
 		}

lib/os/class.ISPConfigBaseOS.inc.php

@@ -86,7 +86,7 @@ class ISPConfigBaseOS {
 		while($result === false && $tries > 0) {
 			$return_var = 0;
 			$output = array();
-			$result = exec($cmd, $output, $return_var);
+			$tmp = exec($cmd, $output, $return_var);
 			ISPConfigLog::debug('CMD: ' . $cmd . ' returned code ' . $return_var);
 			if($return_var === 0 || (!empty($returncodes_ok) && is_array($returncodes_ok) && in_array($return_var, $returncodes_ok, true))) {
 				$result = implode("\n", $output);

lib/os/class.ISPConfigDebianOS.inc.php

@@ -273,7 +273,11 @@ maxretry = 3';
 		ISPConfigLog::info('Installing Mailman', true);
 		
 		$cmd = 'echo "mailman mailman/site_languages multiselect de (German), en (English)" | debconf-set-selections 2>&1' . "\n";
-		$cmd .= 'echo "mailman mailman/default_server_language select en (English)" | debconf-set-selections 2>&1';
+		if(isset($_GET['lang']) && $_GET['lang'] === 'de') {
+			$cmd .= 'echo "mailman mailman/default_server_language select de (German)" | debconf-set-selections 2>&1';
+		} else {
+			$cmd .= 'echo "mailman mailman/default_server_language select en (English)" | debconf-set-selections 2>&1';
+		}
 		$result = $this->exec($cmd);
 		if($result === false) {
 			throw new ISPConfigOSException('Command ' . $cmd . ' failed.');
@@ -964,7 +968,7 @@ mailman-unsubscribe:  "|/var/lib/mailman/mail/mailman unsubscribe mailman"';
 		
 		if(!ISPConfig::wantsInteractive()) {
 			$autoinstall = '[install]
-	language=en
+	language=' . (isset($_GET['lang']) && $_GET['lang'] === 'de' ? 'de' : 'en') . '
 	install_mode=expert
 	hostname=' . $host_name . '
 	mysql_hostname=localhost
@@ -1068,6 +1072,10 @@ mailman-unsubscribe:  "|/var/lib/mailman/mail/mailman unsubscribe mailman"';
 		}
 		
 		$this->restartService('clamav-daemon');
+		if(ISPConfig::shallInstall('mail')) {
+			$this->startService('rspamd');
+		}
+		
 		
 		ISPConfigLog::info('Checking all services are running.', true);
 		$check_services = array(