Remove old file

data/Dockerfiles/sogo/gnustep_defaults.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-defaults write sogod SOGoUserSources '({type = sql;id = directory;viewURL = mysql://${DBUSER}:${DBPASS}@${DBHOST}:3306/${DBNAME}/sogo_view;canAuthenticate = YES;isAddressBook = YES;displayName = \"GAL\";MailFieldNames = (aliases, ad_aliases, senderacl);userPasswordAlgorithm = ssha256;})'
-defaults write sogod SOGoProfileURL 'mysql://${DBUSER}:${DBPASS}@${DBHOST}:3306/${DBNAME}/sogo_user_profile'
-defaults write sogod OCSFolderInfoURL 'mysql://${DBUSER}:${DBPASS}@${DBHOST}:3306/${DBNAME}/sogo_folder_info'
-defaults write sogod OCSEMailAlarmsFolderURL 'mysql://${DBUSER}:${DBPASS}@${DBHOST}:3306/${DBNAME}/sogo_alarms_folder'
-defaults write sogod OCSSessionsFolderURL 'mysql://${DBUSER}:${DBPASS}@${DBHOST}:3306/${DBNAME}/sogo_sessions_folder'
-

data/assets/fix-permissions.sh

@@ -0,0 +1,2 @@
+chown -R 5000:5000 ../vmail
+chown -R 33:33 ../dkim

data/assets/mysql/pw.sql

@@ -1,2 +0,0 @@
-REPLACE INTO admin VALUES ('admin','{SSHA256}K8eVJ6YsZbQCfuJvSUbaQRLr0HPLz5rC9IAp0PAFl0tmNDBkMDc0NDAyOTAxN2Rk', 1, NOW(), NOW(), 1);
-REPLACE INTO domain_admins (username, domain, created, active) VALUES ('admin', 'ALL', NOW(), '1');

data/conf/nginx/site.conf

@@ -30,6 +30,11 @@ server {
 		    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 		}
 
+        location ^~ /inc/init.sql {
+			deny all;
+        }
+
+
         location ^~ /Microsoft-Server-ActiveSync {
                 proxy_pass http://sogo/SOGo/Microsoft-Server-ActiveSync;
                 proxy_connect_timeout 1000;

data/web/inc/functions.inc.php

@@ -32,6 +32,31 @@ function hasDomainAccess($username, $role, $domain) {
 	}
 	return false;
 }
+function init_db_schema() {
+	global $pdo;
+	try {
+		$stmt = $pdo->prepare("SELECT `username` FROM `admin`");
+		$stmt->execute();
+	}
+	catch (Exception $e) {
+		$lines = file('/web/inc/init.sql');
+		$data = '';
+		foreach ($lines as $line) {
+			if (substr($line, 0, 2) == '--' || $line == '') {
+				continue;
+			}
+			$data .= $line;
+			if (substr(trim($line), -1, 1) == ';') {
+				$pdo->query($data);
+				$data = '';
+			}
+		}
+		$_SESSION['return'] = array(
+			'type' => 'success',
+			'msg' => 'Database initialization completed.'
+		);
+	}
+}
 function verify_ssha256($hash, $password) {
 	// Remove tag if any
 	$hash = ltrim($hash, '{SSHA256}');

data/web/inc/init.sql

@@ -245,3 +245,12 @@ CREATE TABLE IF NOT EXISTS sogo_user_profile (
 	c_settings text,
 	PRIMARY KEY (c_uid)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
+
+INSERT INTO admin (username, password, superadmin, created, modified, active)
+	SELECT 'admin', '{SSHA256}K8eVJ6YsZbQCfuJvSUbaQRLr0HPLz5rC9IAp0PAFl0tmNDBkMDc0NDAyOTAxN2Rk', 1, NOW(), NOW(), 1
+	WHERE NOT EXISTS (SELECT username FROM admin WHERE superadmin='1');
+
+INSERT INTO domain_admins (username, domain, created, active)
+    SELECT 'admin', 'ALL', NOW(), 1
+    WHERE NOT EXISTS (SELECT username FROM domain_admins WHERE domain='ALL');
+

data/web/inc/prerequisites.inc.php

@@ -22,7 +22,6 @@ $opt = [
     PDO::ATTR_EMULATE_PREPARES   => false,
 ];
 $pdo = new PDO($dsn, $database_user, $database_pass, $opt);
-
 $_SESSION['mailcow_locale'] = strtolower(trim($DEFAULT_LANG));
 setcookie('language', $DEFAULT_LANG);
 if (isset($_COOKIE['language'])) {
@@ -69,3 +68,4 @@ require_once 'lang/lang.en.php';
 include 'lang/lang.'.$_SESSION['mailcow_locale'].'.php';
 require_once 'inc/functions.inc.php';
 require_once 'inc/triggers.inc.php';
+init_db_schema();

data/web/inc/vars.inc.php

@@ -1,5 +1,5 @@
 <?php
-error_reporting(0);
+error_reporting(E_ALL);
 
 /*
 PLEASE USE THE FILE "vars.local.inc.php" TO OVERWRITE SETTINGS AND MAKE THEM PERSISTENT!