From 31a42f88ae7d2cd2408211285823e2887982f9d6 Mon Sep 17 00:00:00 2001
From: Till <t.brehm@ispconfig.org>
Date: Fri, 9 Feb 2024 06:43:26 +0100
Subject: [PATCH] Fixes #6641 Multiserver sync issues with some older systems
---
install/sql/incremental/upd_0099.sql | 6 ++++++
install/sql/ispconfig3.sql | 10 +++++-----
2 files changed, 11 insertions(+), 5 deletions(-)
create mode 100644 install/sql/incremental/upd_0099.sql
diff --git a/install/sql/incremental/upd_0099.sql b/install/sql/incremental/upd_0099.sql
new file mode 100644
index 0000000000..b822310c94
--- /dev/null
+++ b/install/sql/incremental/upd_0099.sql
@@ -0,0 +1,6 @@
+ALTER TABLE `spamfilter_policy`
+CHANGE `warnvirusrecip` `warnvirusrecip` VARCHAR(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT 'N',
+CHANGE `warnbannedrecip` `warnbannedrecip` VARCHAR(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT 'N',
+CHANGE `warnbadhrecip` `warnbadhrecip` VARCHAR(1) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT 'N';
+ALTER TABLE `sys_ini` CHANGE `default_logo` `default_logo` TEXT CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL;
+ALTER TABLE `sys_ini` CHANGE `custom_logo` `custom_logo` TEXT CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL;
\ No newline at end of file
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 75529ab82b..ff582262bb 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -1532,9 +1532,9 @@ CREATE TABLE `spamfilter_policy` (
`addr_extension_spam` varchar(64) default NULL,
`addr_extension_banned` varchar(64) default NULL,
`addr_extension_bad_header` varchar(64) default NULL,
- `warnvirusrecip` enum('N','Y') default 'N',
- `warnbannedrecip` enum('N','Y') default 'N',
- `warnbadhrecip` enum('N','Y') default 'N',
+ `warnvirusrecip` VARCHAR(1) NULL default 'N',
+ `warnbannedrecip` VARCHAR(1) NULL default 'N',
+ `warnbadhrecip` VARCHAR(1) NULL default 'N',
`newvirus_admin` varchar(64) default NULL,
`virus_admin` varchar(64) default NULL,
`banned_admin` varchar(64) default NULL,
@@ -1741,8 +1741,8 @@ CREATE TABLE `sys_group` (
CREATE TABLE `sys_ini` (
`sysini_id` int(11) unsigned NOT NULL auto_increment,
`config` longtext,
- `default_logo` text NOT NULL,
- `custom_logo` text NOT NULL,
+ `default_logo` text NULL,
+ `custom_logo` text NULL,
PRIMARY KEY (`sysini_id`)
) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
--
GitLab