From a08e6c32e70561a3fadbd6062ca02c5f8c94b81d Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Thu, 03 Apr 2014 11:44:13 -0400
Subject: [PATCH] - Merged language files - Updated version number to 3.0.5.4rc1

---
 install/sql/ispconfig3.sql |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 9e2d6c8..2e0d3de 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -740,8 +740,8 @@
   `server_id` int(11) unsigned NOT NULL default '0',
   `domain` varchar(255) NOT NULL default '',
   `dkim` ENUM( 'n', 'y' ) NOT NULL default 'n',
-  `dkim_private` mediumtext NOT NULL,
-  `dkim_public` mediumtext NOT NULL,
+  `dkim_private` mediumtext NULL,
+  `dkim_public` mediumtext NULL,
   `active` enum('n','y') NOT NULL,
   PRIMARY KEY  (`domain_id`),
   KEY `server_id` (`server_id`,`domain`),
@@ -918,7 +918,7 @@
   `disablelmtp` enum('n','y') NOT NULL default 'n',
   `disabledoveadm` enum('n','y') NOT NULL default 'n',
   `last_quota_notification` date NULL default NULL,
-  `backup_interval` VARCHAR( 255 ) NOT NULL,
+  `backup_interval` VARCHAR( 255 ) NOT NULL default 'none',
   `backup_copies` INT NOT NULL DEFAULT '1',
   PRIMARY KEY  (`mailuser_id`),
   KEY `server_id` (`server_id`,`email`),
@@ -2287,7 +2287,7 @@
 -- Dumping data for table `sys_config`
 --
 
-INSERT INTO sys_config VALUES ('db','db_version','3.0.5.4b1');
+INSERT INTO sys_config VALUES ('db','db_version','3.0.5.4rc1');
 INSERT INTO sys_config VALUES ('interface','session_timeout','0');
 
 SET FOREIGN_KEY_CHECKS = 1;

--
Gitblit v1.9.1