From 213e0bc6bc26a40cd8a29daf997a9c46b1f10ce1 Mon Sep 17 00:00:00 2001
From: Falko Timme <ft@falkotimme.com>
Date: Wed, 30 Oct 2013 08:36:43 -0400
Subject: [PATCH] - Company ID can now have a length of up to 255 characters (instead of just 30).
---
install/sql/ispconfig3.sql | 97 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 88 insertions(+), 9 deletions(-)
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 2058408..565db7e 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -59,6 +59,11 @@
CREATE TABLE IF NOT EXISTS `aps_instances` (
`id` int(4) NOT NULL AUTO_INCREMENT,
+ `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
+ `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
+ `sys_perm_user` varchar(5) DEFAULT NULL,
+ `sys_perm_group` varchar(5) DEFAULT NULL,
+ `sys_perm_other` varchar(5) DEFAULT NULL,
`server_id` int(11) NOT NULL DEFAULT '0',
`customer_id` int(4) NOT NULL,
`package_id` int(4) NOT NULL,
@@ -139,7 +144,8 @@
`sys_perm_group` varchar(5) DEFAULT NULL,
`sys_perm_other` varchar(5) DEFAULT NULL,
`company_name` varchar(64) DEFAULT NULL,
- `company_id` varchar(30) DEFAULT NULL,
+ `company_id` varchar(255) DEFAULT NULL,
+ `gender` enum('','m','f') NOT NULL DEFAULT '',
`contact_name` varchar(64) DEFAULT NULL,
`customer_no` varchar(64) DEFAULT NULL,
`vat_id` varchar(64) DEFAULT NULL,
@@ -155,11 +161,13 @@
`internet` varchar(255) NOT NULL,
`icq` varchar(16) DEFAULT NULL,
`notes` text,
+ `bank_account_owner` varchar(255) DEFAULT NULL,
`bank_account_number` varchar(255) DEFAULT NULL,
`bank_code` varchar(255) DEFAULT NULL,
`bank_name` varchar(255) DEFAULT NULL,
`bank_account_iban` varchar(255) DEFAULT NULL,
`bank_account_swift` varchar(255) DEFAULT NULL,
+ `paypal_email` varchar(255) DEFAULT NULL,
`default_mailserver` int(11) unsigned NOT NULL DEFAULT '1',
`limit_maildomain` int(11) NOT NULL DEFAULT '-1',
`limit_mailbox` int(11) NOT NULL DEFAULT '-1',
@@ -178,7 +186,7 @@
`limit_web_ip` text,
`limit_web_domain` int(11) NOT NULL DEFAULT '-1',
`limit_web_quota` int(11) NOT NULL DEFAULT '-1',
- `web_php_options` varchar(255) NOT NULL DEFAULT 'no,fast-cgi,cgi,mod,suphp',
+ `web_php_options` varchar(255) NOT NULL DEFAULT 'no,fast-cgi,cgi,mod,suphp,php-fpm',
`limit_cgi` enum('n','y') NOT NULL DEFAULT 'n',
`limit_ssi` enum('n','y') NOT NULL DEFAULT 'n',
`limit_perl` enum('n','y') NOT NULL DEFAULT 'n',
@@ -194,9 +202,10 @@
`limit_shell_user` int(11) NOT NULL DEFAULT '0',
`ssh_chroot` varchar(255) NOT NULL DEFAULT 'no,jailkit,ssh-chroot',
`limit_webdav_user` int(11) NOT NULL DEFAULT '0',
- `limit_aps` int(11) NOT NULL DEFAULT '0',
+ `limit_aps` int(11) NOT NULL DEFAULT '-1',
`default_dnsserver` int(11) unsigned NOT NULL DEFAULT '1',
`limit_dns_zone` int(11) NOT NULL DEFAULT '-1',
+ `default_slave_dnsserver` int(11) unsigned NOT NULL DEFAULT '1',
`limit_dns_slave_zone` int(11) NOT NULL DEFAULT '-1',
`limit_dns_record` int(11) NOT NULL DEFAULT '-1',
`default_dbserver` int(11) NOT NULL DEFAULT '1',
@@ -215,8 +224,12 @@
`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` varchar(255) NOT NULL DEFAULT '',
+ `template_additional` text NOT NULL DEFAULT '',
`created_at` bigint(20) DEFAULT NULL,
+ `locked` enum('n','y') NOT NULL DEFAULT 'n',
+ `canceled` enum('n','y') NOT NULL DEFAULT 'n',
+ `can_use_api` enum('n','y') NOT NULL DEFAULT 'n',
+ `tmp_data` mediumblob,
`id_rsa` varchar(2000) NOT NULL DEFAULT '',
`ssh_rsa` varchar(600) NOT NULL DEFAULT '',
PRIMARY KEY (`client_id`)
@@ -289,7 +302,7 @@
`limit_shell_user` int(11) NOT NULL default '0',
`ssh_chroot` varchar(255) NOT NULL DEFAULT 'no',
`limit_webdav_user` int(11) NOT NULL default '0',
- `limit_aps` int(11) NOT NULL DEFAULT '0',
+ `limit_aps` int(11) NOT NULL DEFAULT '-1',
`limit_dns_zone` int(11) NOT NULL default '-1',
`limit_dns_slave_zone` int(11) NOT NULL default '-1',
`limit_dns_record` int(11) NOT NULL default '-1',
@@ -305,6 +318,19 @@
PRIMARY KEY (`template_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `client_template_assigned`
+--
+
+CREATE TABLE `client_template_assigned` (
+ `assigned_template_id` bigint(20) NOT NULL auto_increment,
+ `client_id` bigint(11) NOT NULL DEFAULT '0',
+ `client_template_id` int(11) NOT NULL DEFAULT '0',
+ PRIMARY KEY (`assigned_template_id`),
+ KEY `client_id` (`client_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
-- --------------------------------------------------------
--
@@ -343,6 +369,26 @@
`run_wday` varchar(100) NULL,
`active` enum('n','y') NOT NULL default 'y',
PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `directive_snippets`
+--
+
+CREATE TABLE IF NOT EXISTS `directive_snippets` (
+ `directive_snippets_id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+ `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
+ `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
+ `sys_perm_user` varchar(5) DEFAULT NULL,
+ `sys_perm_group` varchar(5) DEFAULT NULL,
+ `sys_perm_other` varchar(5) DEFAULT NULL,
+ `name` varchar(255) DEFAULT NULL,
+ `type` varchar(255) DEFAULT NULL,
+ `snippet` mediumtext,
+ `active` enum('n','y') NOT NULL DEFAULT 'y',
+ PRIMARY KEY (`directive_snippets_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
-- --------------------------------------------------------
@@ -391,7 +437,7 @@
`active` enum('N','Y') NOT NULL,
`xfer` varchar(255) NOT NULL,
PRIMARY KEY (`id`),
- UNIQUE KEY `origin` (`origin`),
+ UNIQUE KEY `slave` (`origin`,`server_id`),
KEY `active` (`active`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -499,6 +545,7 @@
`server_id` int(11) unsigned NOT NULL default '0',
`parent_domain_id` int(11) unsigned NOT NULL default '0',
`username` varchar(64) default NULL,
+ `username_prefix` varchar(50) NOT NULL default '',
`password` varchar(64) default NULL,
`quota_size` bigint(20) NOT NULL default '-1',
`active` enum('n','y') NOT NULL default 'y',
@@ -808,6 +855,7 @@
`disablesieve` enum('n','y') NOT NULL default 'n',
`disablelda` enum('n','y') NOT NULL default 'n',
`disabledoveadm` enum('n','y') NOT NULL default 'n',
+ `last_quota_notification` date NULL default NULL,
PRIMARY KEY (`mailuser_id`),
KEY `server_id` (`server_id`,`email`),
KEY `email_access` (`email`,`access`)
@@ -1036,6 +1084,7 @@
`remote_session` varchar(64) NOT NULL,
`remote_userid` int(11) unsigned NOT NULL,
`remote_functions` text NOT NULL,
+ `client_login` tinyint(1) unsigned NOT NULL default '0',
`tstamp` int(10) unsigned NOT NULL,
PRIMARY KEY (`remote_session`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
@@ -1152,6 +1201,7 @@
`server_id` int(11) unsigned NOT NULL default '0',
`parent_domain_id` int(11) unsigned NOT NULL default '0',
`username` varchar(64) default NULL,
+ `username_prefix` varchar(50) NOT NULL default '',
`password` varchar(64) default NULL,
`quota_size` bigint(20) NOT NULL default '-1',
`active` enum('n','y') NOT NULL default 'y',
@@ -1380,6 +1430,21 @@
-- --------------------------------------------------------
+--
+-- Table structure for table `sys_cron`
+--
+
+CREATE TABLE IF NOT EXISTS `sys_cron` (
+ `name` varchar(50) NOT NULL,
+ `last_run` datetime NULL DEFAULT NULL,
+ `next_run` datetime NULL DEFAULT NULL,
+ `running` tinyint(1) UNSIGNED NOT NULL DEFAULT '0',
+ PRIMARY KEY (`name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
+-- --------------------------------------------------------
+
--
-- Table structure for table `sys_datalog`
--
@@ -1394,6 +1459,7 @@
`user` varchar(255) NOT NULL default '',
`data` longtext NOT NULL,
`status` set('pending','ok','warning','error') NOT NULL default 'ok',
+ `error` mediumtext,
PRIMARY KEY (`datalog_id`),
KEY `server_id` (`server_id`,`status`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -1524,6 +1590,11 @@
--
CREATE TABLE IF NOT EXISTS `sys_theme` (
+ `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
+ `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
+ `sys_perm_user` varchar(5) DEFAULT NULL,
+ `sys_perm_group` varchar(5) DEFAULT NULL,
+ `sys_perm_other` varchar(5) DEFAULT NULL,
`var_id` int(11) unsigned NOT NULL AUTO_INCREMENT,
`tpl_name` varchar(32) NOT NULL,
`username` varchar(64) NOT NULL,
@@ -1576,6 +1647,7 @@
`server_id` int(11) unsigned NOT NULL DEFAULT '0',
`parent_domain_id` int(11) unsigned NOT NULL DEFAULT '0',
`username` varchar(64) DEFAULT NULL,
+ `username_prefix` varchar(50) NOT NULL default '',
`password` varchar(64) DEFAULT NULL,
`active` enum('n','y') NOT NULL DEFAULT 'y',
`dir` varchar(255) DEFAULT NULL,
@@ -1616,6 +1688,7 @@
`parent_domain_id` int(11) unsigned NOT NULL DEFAULT '0',
`type` varchar(16) NOT NULL DEFAULT 'y',
`database_name` varchar(64) DEFAULT NULL,
+ `database_name_prefix` varchar(50) NOT NULL default '',
`database_user_id` int(11) unsigned DEFAULT NULL,
`database_ro_user_id` int(11) unsigned DEFAULT NULL,
`database_charset` varchar(64) DEFAULT NULL,
@@ -1642,7 +1715,9 @@
`sys_perm_user` varchar(5) DEFAULT NULL,
`sys_perm_group` varchar(5) DEFAULT NULL,
`sys_perm_other` varchar(5) DEFAULT NULL,
+ `server_id` int(11) UNSIGNED NOT NULL DEFAULT '0',
`database_user` varchar(64) DEFAULT NULL,
+ `database_user_prefix` varchar(50) NOT NULL default '',
`database_password` varchar(64) DEFAULT NULL,
PRIMARY KEY (`database_user_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -1718,6 +1793,9 @@
`active` enum('n','y') NOT NULL default 'y',
`traffic_quota_lock` enum('n','y') NOT NULL default 'n',
`fastcgi_php_version` varchar(255) DEFAULT NULL,
+ `proxy_directives` mediumtext,
+ `last_quota_notification` date NULL default NULL,
+ `rewrite_rules` mediumtext,
PRIMARY KEY (`domain_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -1993,7 +2071,7 @@
('ST', 'SAO TOME AND PRINCIPE', 'Sao Tome and Principe', 'STP', 678),
('SA', 'SAUDI ARABIA', 'Saudi Arabia', 'SAU', 682),
('SN', 'SENEGAL', 'Senegal', 'SEN', 686),
-('CS', 'SERBIA AND MONTENEGRO', 'Serbia and Montenegro', NULL, NULL),
+('RS', 'SERBIA', 'Serbia', 'SRB', 381),
('SC', 'SEYCHELLES', 'Seychelles', 'SYC', 690),
('SL', 'SIERRA LEONE', 'Sierra Leone', 'SLE', 694),
('SG', 'SINGAPORE', 'Singapore', 'SGP', 702),
@@ -2043,7 +2121,8 @@
('EH', 'WESTERN SAHARA', 'Western Sahara', 'ESH', 732),
('YE', 'YEMEN', 'Yemen', 'YEM', 887),
('ZM', 'ZAMBIA', 'Zambia', 'ZMB', 894),
-('ZW', 'ZIMBABWE', 'Zimbabwe', 'ZWE', 716);
+('ZW', 'ZIMBABWE', 'Zimbabwe', 'ZWE', 716),
+('ME', 'MONTENEGRO', 'Montenegro', 'MNE', 382);
-- --------------------------------------------------------
@@ -2130,6 +2209,6 @@
-- Dumping data for table `sys_config`
--
-INSERT INTO sys_config VALUES ('1','db','db_version','3.0.5');
+INSERT INTO sys_config VALUES ('1','db','db_version','3.0.5.3');
SET FOREIGN_KEY_CHECKS = 1;
\ No newline at end of file
--
Gitblit v1.9.1