Merge branch 'master' into 'patch-ci-test'

# Conflicts:
#   .gitlab-ci.yml

Author: Marius Burkard

install/dist/lib/opensuse.lib.php

@@ -507,7 +507,7 @@ public function configure_amavis() {
 		$content = str_replace('{mysql_server_port}', $conf["mysql"]["port"], $content);
 		$content = str_replace('{mysql_server_ip}', $conf['mysql']['ip'], $content);
 		$content = str_replace('{hostname}', $conf['hostname'], $content);
-		$content = str_replace('{amavis_config_dir}', $conf['amavis']['config_dir']);
+		$content = str_replace('{amavis_config_dir}', $conf['amavis']['config_dir'], $content);
 		wf($conf["amavis"]["config_dir"].'/amavisd.conf', $content);
 		chmod($conf['amavis']['config_dir'].'/amavisd.conf', 0640);
 

install/tpl/apache_ispconfig.vhost.master

@@ -91,8 +91,19 @@
   </tmpl_if>
 
   <IfModule mod_headers.c>
-    Header always add Strict-Transport-Security "max-age=15768000"
-	RequestHeader unset Proxy early
+    # ISPConfig 3.1 currently requires unsafe-line for both scripts and styles, as well as unsafe-eval
+    Header set Content-Security-Policy "default-src 'self' 'unsafe-inline' 'unsafe-eval'; img-src 'self' data:; object-src 'none'; upgrade-insecure-requests"
+    Header set X-Content-Type-Options: nosniff
+    Header set X-Frame-Options: SAMEORIGIN
+    Header set X-XSS-Protection: "1; mode=block"
+    Header always edit Set-Cookie (.*) "$1; HTTPOnly; Secure"
+    <IfVersion >= 2.4.7>
+        Header setifempty Strict-Transport-Security "max-age=15768000"
+    </IfVersion>
+    <IfVersion < 2.4.7>
+        Header set Strict-Transport-Security "max-age=15768000"
+    </IfVersion>
+    RequestHeader unset Proxy early
   </IfModule>
 
   <tmpl_if name='apache_version' op='>=' value='2.3.3' format='version'>

interface/lib/app.inc.php

@@ -62,7 +62,11 @@ public function __construct() {
 		$this->_conf = $conf;
 		if($this->_conf['start_db'] == true) {
 			$this->load('db_'.$this->_conf['db_type']);
-			$this->db = new db;
+			try {
+				$this->db = new db;
+			} catch (Exception $e) {
+				$this->db = false;
+			}
 		}
 
 		//* Start the session