From c56175b5781ee8a20bebe3015bcbe8ea68b9c8b7 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 14 Aug 2014 05:04:37 -0400
Subject: [PATCH] Merge branch 'convert_to_reseller' into 'master'
---
install/sql/ispconfig3.sql | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 42b310b..7f81f7c 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -146,6 +146,7 @@
`company_name` varchar(64) DEFAULT NULL,
`company_id` varchar(255) DEFAULT NULL,
`gender` enum('','m','f') NOT NULL DEFAULT '',
+ `contact_firstname` varchar( 64 ) NOT NULL DEFAULT '',
`contact_name` varchar(64) DEFAULT NULL,
`customer_no` varchar(64) DEFAULT NULL,
`vat_id` varchar(64) DEFAULT NULL,
@@ -447,7 +448,7 @@
`sys_perm_other` varchar(5) NOT NULL DEFAULT '',
`server_id` int(11) NOT NULL default '1',
`zone` int(11) unsigned NOT NULL DEFAULT '0',
- `name` varchar(64) NOT NULL DEFAULT '',
+ `name` varchar(255) NOT NULL DEFAULT '',
`type` enum('A','AAAA','ALIAS','CNAME','HINFO','MX','NAPTR','NS','PTR','RP','SRV','TXT') default NULL,
`data` varchar(255) NOT NULL DEFAULT '',
`aux` int(11) unsigned NOT NULL default '0',
@@ -598,6 +599,7 @@
`dl_ratio` int(11) NOT NULL default '-1',
`ul_bandwidth` int(11) NOT NULL default '-1',
`dl_bandwidth` int(11) NOT NULL default '-1',
+ `expires` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
PRIMARY KEY (`ftp_user_id`),
KEY `active` (`active`),
KEY `server_id` (`server_id`),
@@ -896,8 +898,8 @@
`login` varchar(255) NOT NULL default '',
`password` varchar(255) NOT NULL default '',
`name` varchar(255) NOT NULL default '',
- `uid` int(11) unsigned NOT NULL default '5000',
- `gid` int(11) unsigned NOT NULL default '5000',
+ `uid` int(11) NOT NULL default '5000',
+ `gid` int(11) NOT NULL default '5000',
`maildir` varchar(255) NOT NULL default '',
`quota` bigint(20) NOT NULL default '-1',
`cc` varchar(255) NOT NULL default '',
@@ -2291,7 +2293,7 @@
-- Dumping data for table `sys_config`
--
-INSERT INTO sys_config VALUES ('db','db_version','3.0.5.4p1');
+INSERT INTO sys_config VALUES ('db','db_version','3.1dev');
INSERT INTO sys_config VALUES ('interface','session_timeout','0');
SET FOREIGN_KEY_CHECKS = 1;
--
Gitblit v1.9.1