From baa7f2736bc91ca3feaed685e8a67a46db4fbb98 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Mon, 17 Feb 2014 05:02:38 -0500
Subject: [PATCH] Fixed vhostsubdomain not empty regex check to allow 1 char subdomains.
---
install/sql/ispconfig3.sql | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 81a4cf3..a6fec74 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -229,7 +229,7 @@
`language` char(2) NOT NULL DEFAULT 'en',
`usertheme` varchar(32) NOT NULL DEFAULT 'default',
`template_master` int(11) unsigned NOT NULL DEFAULT '0',
- `template_additional` text NOT NULL DEFAULT '',
+ `template_additional` text NOT NULL,
`created_at` bigint(20) DEFAULT NULL,
`locked` enum('n','y') NOT NULL DEFAULT 'n',
`canceled` enum('n','y') NOT NULL DEFAULT 'n',
@@ -450,7 +450,7 @@
`stamp` timestamp NOT NULL default CURRENT_TIMESTAMP,
`serial` int(10) unsigned default NULL,
PRIMARY KEY (`id`),
- UNIQUE KEY `rr` (`zone`,`name`,`type`,`data`)
+ KEY `rr` (`zone`,`type`,`name`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
-- --------------------------------------------------------
@@ -736,8 +736,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 default '',
- `dkim_public` mediumtext NOT NULL default '',
+ `dkim_private` mediumtext NOT NULL,
+ `dkim_public` mediumtext NOT NULL,
`active` enum('n','y') NOT NULL,
PRIMARY KEY (`domain_id`),
KEY `server_id` (`server_id`,`domain`),
@@ -1486,10 +1486,10 @@
--
CREATE TABLE `sys_config` (
- `config_id` int(11) unsigned NOT NULL,
`group` varchar(64) NOT NULL,
`name` varchar(64) NOT NULL,
- `value` varchar(255) NOT NULL
+ `value` varchar(255) NOT NULL,
+ PRIMARY KEY (`group`, `name`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -1689,7 +1689,7 @@
`typ` varchar(16) NOT NULL default 'user',
`active` tinyint(1) NOT NULL default '1',
`language` varchar(2) NOT NULL default 'en',
- `groups` TEXT NOT NULL default '',
+ `groups` TEXT NOT NULL,
`default_group` int(11) unsigned NOT NULL default '0',
`client_id` int(11) unsigned NOT NULL default '0',
`id_rsa` VARCHAR( 2000 ) NOT NULL default '',
@@ -1867,7 +1867,8 @@
`rewrite_rules` mediumtext,
`added_date` date NOT NULL DEFAULT '0000-00-00',
`added_by` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`domain_id`)
+ PRIMARY KEY (`domain_id`),
+ UNIQUE KEY `serverdomain` ( `server_id` , `domain` )
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
-- --------------------------------------------------------
@@ -2280,7 +2281,7 @@
-- Dumping data for table `sys_config`
--
-INSERT INTO sys_config VALUES ('1','db','db_version','3.0.5.3');
-INSERT INTO sys_config VALUES ('2','interface','session_timeout','0');
+INSERT INTO sys_config VALUES ('db','db_version','3.0.5.4dev');
+INSERT INTO sys_config VALUES ('interface','session_timeout','0');
SET FOREIGN_KEY_CHECKS = 1;
--
Gitblit v1.9.1