Merge branch 'develop' of git.ispconfig.org:ispconfig/ispconfig3 into develop

Author: florian030

install/install.php

@@ -621,7 +621,7 @@
 if($conf['saslauthd']['installed'] == true && $conf['saslauthd']['init_script'] != '') system($inst->getinitcommand($conf['saslauthd']['init_script'], 'restart'));
 if($conf['amavis']['installed'] == true && $conf['amavis']['init_script'] != '') system($inst->getinitcommand($conf['amavis']['init_script'], 'restart'));
 if($conf['rspamd']['installed'] == true && $conf['rspamd']['init_script'] != '') system($inst->getinitcommand($conf['rspamd']['init_script'], 'restart'));
-if($conf['clamav']['installed'] == true && $conf['clamav']['init_script'] != '') system($inst->getinitcommand($conf['clamav']['init_script'], 'restart'));
+if($conf['clamav']['installed'] == true && $conf['clamav']['init_script'] != '' && $conf['amavis']['installed'] == true) system($inst->getinitcommand($conf['clamav']['init_script'], 'restart'));
 if($conf['courier']['installed'] == true){
 	if($conf['courier']['courier-authdaemon'] != '') system($inst->getinitcommand($conf['courier']['courier-authdaemon'], 'restart'));
 	if($conf['courier']['courier-imap'] != '') system($inst->getinitcommand($conf['courier']['courier-imap'], 'restart'));

install/tpl/postfix_2-5.conf.master

@@ -11,3 +11,4 @@
 #{stress_adaptive} smtpd_soft_error_limit = ${stress?2}${stress:5}
 #{stress_adaptive} smtpd_timeout = ${stress?10}${stress:60}s
 
+smtpd_forbidden_commands = CONNECT,GET,POST,USER,PASS

install/tpl/postfix_3-0.conf.master

@@ -11,3 +11,6 @@
 #{stress_adaptive} smtpd_soft_error_limit = ${stress?{2}:{5}}
 #{stress_adaptive} smtpd_timeout = ${stress?{10}:{60}}s
 
+# validate DANE
+smtp_dns_support_level = dnssec
+smtp_tls_security_level = dane

install/update.php

@@ -580,7 +580,7 @@
 		if($conf['saslauthd']['installed'] == true && $conf['saslauthd']['init_script'] != '') system($inst->getinitcommand($conf['saslauthd']['init_script'], 'restart'));
 		if($conf['amavis']['installed'] == true && $conf['amavis']['init_script'] != '') system($inst->getinitcommand($conf['amavis']['init_script'], 'restart'));
 		if($conf['rspamd']['installed'] == true && $conf['rspamd']['init_script'] != '') system($inst->getinitcommand($conf['rspamd']['init_script'], 'restart'));
-		if($conf['clamav']['installed'] == true && $conf['clamav']['init_script'] != '') system($inst->getinitcommand($conf['clamav']['init_script'], 'restart'));
+		if($conf['clamav']['installed'] == true && $conf['clamav']['init_script'] != '' && $conf['amavis']['installed'] == true) system($inst->getinitcommand($conf['clamav']['init_script'], 'restart'));
 		if($conf['courier']['installed'] == true){
 			if($conf['courier']['courier-authdaemon'] != '') system($inst->getinitcommand($conf['courier']['courier-authdaemon'], 'restart'));
 			if($conf['courier']['courier-imap'] != '') system($inst->getinitcommand($conf['courier']['courier-imap'], 'restart'));

server/lib/classes/backup.inc.php

@@ -691,11 +691,11 @@ protected static function get7zDecompressOptions($password)
      * @see backup_plugin::mount_backup_dir()
      * @author Ramil Valitov <ramilvalitov@gmail.com>
      */
-    protected static function clearBackups($server_id, $web_id, $max_backup_copies, $backup_dir)
+    protected static function clearBackups($server_id, $web_id, $max_backup_copies, $backup_dir, $prefix_list=null)
     {
         global $app;
 
-        $files = self::get_files($backup_dir);
+        $files = self::get_files($backup_dir, $prefix_list);
         usort($files, function ($a, $b) use ($backup_dir) {
             $time_a = filemtime($backup_dir . '/' . $a);
             $time_b = filemtime($backup_dir . '/' . $b);
@@ -1214,7 +1214,11 @@ protected static function make_database_backup($web_domain, $backup_job)
 
                 //* Remove old backups
                 self::backups_garbage_collection($server_id, 'mysql', $domain_id);
-                self::clearBackups($server_id, $domain_id, intval($rec['backup_copies']), $db_backup_dir);
+                $prefix_list = array(
+                            'db_'.escapeshellarg($db_name).'_',
+                            'manual-db_'.escapeshellarg($db_name).'_',
+                        );
+                self::clearBackups($server_id, $domain_id, intval($rec['backup_copies']), $db_backup_dir, $prefix_list);
             } else {
                 $app->log('Failed to process mysql backup format ' . $backup_format_db . ' for database ' . $rec['database_name'], LOGLEVEL_ERROR);
             }
@@ -1285,7 +1289,13 @@ protected static function make_web_backup($web_domain, $backup_job)
         self::prepare_backup_dir($server_id, $web_domain);
         $web_backup_dir = $backup_dir . '/web' . $web_id;
 
-        $backup_excludes = array(escapeshellarg('./backup\*'));
+	# default exclusions
+	$backup_excludes = array(
+		escapeshellarg('./backup\*'),
+		'./bin', './dev', './etc', './lib', './lib32', './lib64', './opt', './sys', './usr', './var', './proc', './run', './tmp',
+		'./log',
+		);
+
         $b_excludes = explode(',', trim($web_domain['backup_excludes']));
         if (is_array($b_excludes) && !empty($b_excludes)) {
             foreach ($b_excludes as $b_exclude) {
@@ -1324,7 +1334,11 @@ protected static function make_web_backup($web_domain, $backup_job)
             $app->log('Backup of web files for domain ' . $web_domain['domain'] . ' failed using path ' . $web_path . ' failed.', LOGLEVEL_ERROR);
         }
 
-        self::clearBackups($server_id, $web_id, intval($web_domain['backup_copies']), $web_backup_dir);
+	$prefix_list = array(
+		    'web',
+		    'manual-web',
+		);
+        self::clearBackups($server_id, $web_id, intval($web_domain['backup_copies']), $web_backup_dir, $prefix_list);
         return true;
     }