From 9b155852f4a352ddb793ac4252702170b6509c17 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Sun, 11 May 2014 17:39:51 -0400
Subject: [PATCH] Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3
---
install/sql/ispconfig3.sql | 334 ++++++++++++++++++++++++++++---------------------------
1 files changed, 169 insertions(+), 165 deletions(-)
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 459e0f3..3c1f0c5 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -65,9 +65,9 @@
`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,
- `instance_status` int(4) NOT NULL,
+ `customer_id` int(4) NOT NULL DEFAULT '0',
+ `package_id` int(4) NOT NULL DEFAULT '0',
+ `instance_status` int(4) NOT NULL DEFAULT '0',
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
@@ -80,9 +80,9 @@
CREATE TABLE IF NOT EXISTS `aps_instances_settings` (
`id` int(4) NOT NULL AUTO_INCREMENT,
`server_id` int(11) NOT NULL DEFAULT '0',
- `instance_id` int(4) NOT NULL,
- `name` varchar(255) NOT NULL,
- `value` text NOT NULL,
+ `instance_id` int(4) NOT NULL DEFAULT '0',
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `value` text,
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
@@ -94,12 +94,12 @@
CREATE TABLE IF NOT EXISTS `aps_packages` (
`id` int(4) NOT NULL AUTO_INCREMENT,
- `path` varchar(255) NOT NULL,
- `name` varchar(255) NOT NULL,
- `category` varchar(255) NOT NULL,
- `version` varchar(20) NOT NULL,
- `release` int(4) NOT NULL,
- `package_url` TEXT NOT NULL,
+ `path` varchar(255) NOT NULL DEFAULT '',
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `category` varchar(255) NOT NULL DEFAULT '',
+ `version` varchar(20) NOT NULL DEFAULT '',
+ `release` int(4) NOT NULL DEFAULT '0',
+ `package_url` TEXT,
`package_status` int(1) NOT NULL DEFAULT '2',
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
@@ -112,8 +112,8 @@
CREATE TABLE IF NOT EXISTS `aps_settings` (
`id` int(4) NOT NULL AUTO_INCREMENT,
- `name` varchar(255) NOT NULL,
- `value` text NOT NULL,
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `value` text,
PRIMARY KEY (`id`),
UNIQUE KEY `name` (`name`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
@@ -125,7 +125,7 @@
--
CREATE TABLE `attempts_login` (
- `ip` varchar(39) NOT NULL,
+ `ip` varchar(39) NOT NULL DEFAULT '',
`times` int(11) DEFAULT NULL,
`login_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
@@ -158,7 +158,7 @@
`mobile` varchar(32) DEFAULT NULL,
`fax` varchar(32) DEFAULT NULL,
`email` varchar(255) DEFAULT NULL,
- `internet` varchar(255) NOT NULL,
+ `internet` varchar(255) NOT NULL DEFAULT '',
`icq` varchar(16) DEFAULT NULL,
`notes` text,
`bank_account_owner` varchar(255) DEFAULT NULL,
@@ -169,7 +169,7 @@
`bank_account_swift` varchar(255) DEFAULT NULL,
`paypal_email` varchar(255) DEFAULT NULL,
`default_mailserver` int(11) unsigned NOT NULL DEFAULT '1',
- `mail_servers` blob NOT NULL,
+ `mail_servers` blob,
`limit_maildomain` int(11) NOT NULL DEFAULT '-1',
`limit_mailbox` int(11) NOT NULL DEFAULT '-1',
`limit_mailalias` int(11) NOT NULL DEFAULT '-1',
@@ -184,7 +184,7 @@
`limit_spamfilter_user` int(11) NOT NULL DEFAULT '0',
`limit_spamfilter_policy` int(11) NOT NULL DEFAULT '0',
`default_webserver` int(11) unsigned NOT NULL DEFAULT '1',
- `web_servers` blob NOT NULL,
+ `web_servers` blob,
`limit_web_ip` text,
`limit_web_domain` int(11) NOT NULL DEFAULT '-1',
`limit_web_quota` int(11) NOT NULL DEFAULT '-1',
@@ -204,15 +204,16 @@
`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_backup` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'y',
`limit_aps` int(11) NOT NULL DEFAULT '-1',
`default_dnsserver` int(11) unsigned NOT NULL DEFAULT '1',
- `db_servers` blob NOT NULL,
+ `db_servers` blob,
`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',
- `dns_servers` blob NOT NULL,
+ `dns_servers` blob,
`limit_database` int(11) NOT NULL DEFAULT '-1',
`limit_database_quota` int(11) NOT NULL default '-1',
`limit_cron` int(11) NOT NULL DEFAULT '0',
@@ -230,7 +231,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,
+ `template_additional` text,
`created_at` bigint(20) DEFAULT NULL,
`locked` enum('n','y') NOT NULL DEFAULT 'n',
`canceled` enum('n','y') NOT NULL DEFAULT 'n',
@@ -279,7 +280,7 @@
`sys_perm_user` varchar(5) default NULL,
`sys_perm_group` varchar(5) default NULL,
`sys_perm_other` varchar(5) default NULL,
- `template_name` varchar(64) NOT NULL,
+ `template_name` varchar(64) NOT NULL DEFAULT '',
`template_type` varchar(1) NOT NULL default 'm',
`limit_maildomain` int(11) NOT NULL default '-1',
`limit_mailbox` int(11) NOT NULL default '-1',
@@ -313,6 +314,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_backup` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'y',
`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',
@@ -375,9 +377,9 @@
--
CREATE TABLE `country` (
- `iso` char(2) NOT NULL,
- `name` varchar(64) NOT NULL,
- `printable_name` varchar(64) NOT NULL,
+ `iso` char(2) NOT NULL DEFAULT '',
+ `name` varchar(64) NOT NULL DEFAULT '',
+ `printable_name` varchar(64) NOT NULL DEFAULT '',
`iso3` char(3) DEFAULT NULL,
`numcode` smallint(6) DEFAULT NULL,
`eu` enum('n','y') NOT NULL DEFAULT 'n',
@@ -399,7 +401,7 @@
`server_id` int(11) unsigned NOT NULL default '0',
`parent_domain_id` int(11) unsigned NOT NULL default '0',
`type` enum('url','chrooted','full') NOT NULL default 'url',
- `command` TEXT NOT NULL,
+ `command` TEXT,
`run_min` varchar(100) NULL,
`run_hour` varchar(100) NULL,
`run_mday` varchar(100) NULL,
@@ -438,16 +440,16 @@
CREATE TABLE `dns_rr` (
`id` int(11) unsigned NOT NULL auto_increment,
- `sys_userid` int(11) unsigned NOT NULL,
- `sys_groupid` int(11) unsigned NOT NULL,
- `sys_perm_user` varchar(5) NOT NULL,
- `sys_perm_group` varchar(5) NOT NULL,
- `sys_perm_other` varchar(5) NOT NULL,
+ `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
+ `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
+ `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
+ `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
+ `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
`server_id` int(11) NOT NULL default '1',
- `zone` int(11) unsigned NOT NULL,
- `name` varchar(64) NOT NULL,
+ `zone` int(11) unsigned NOT NULL DEFAULT '0',
+ `name` varchar(64) NOT NULL DEFAULT '',
`type` enum('A','AAAA','ALIAS','CNAME','HINFO','MX','NAPTR','NS','PTR','RP','SRV','TXT') default NULL,
- `data` varchar(255) NOT NULL,
+ `data` varchar(255) NOT NULL DEFAULT '',
`aux` int(11) unsigned NOT NULL default '0',
`ttl` int(11) unsigned NOT NULL default '86400',
`active` enum('N','Y') NOT NULL default 'Y',
@@ -465,16 +467,16 @@
CREATE TABLE `dns_slave` (
`id` int(10) unsigned NOT NULL auto_increment,
- `sys_userid` int(11) unsigned NOT NULL,
- `sys_groupid` int(11) unsigned NOT NULL,
- `sys_perm_user` varchar(5) NOT NULL,
- `sys_perm_group` varchar(5) NOT NULL,
- `sys_perm_other` varchar(5) NOT NULL,
+ `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
+ `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
+ `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
+ `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
+ `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
`server_id` int(11) NOT NULL default '1',
- `origin` varchar(255) NOT NULL,
- `ns` varchar(255) NOT NULL,
- `active` enum('N','Y') NOT NULL,
- `xfer` varchar(255) NOT NULL,
+ `origin` varchar(255) NOT NULL DEFAULT '',
+ `ns` varchar(255) NOT NULL DEFAULT '',
+ `active` enum('N','Y') NOT NULL DEFAULT 'N',
+ `xfer` varchar(255) NOT NULL DEFAULT '',
PRIMARY KEY (`id`),
UNIQUE KEY `slave` (`origin`,`server_id`),
KEY `active` (`active`)
@@ -488,23 +490,23 @@
CREATE TABLE `dns_soa` (
`id` int(10) unsigned NOT NULL auto_increment,
- `sys_userid` int(11) unsigned NOT NULL,
- `sys_groupid` int(11) unsigned NOT NULL,
- `sys_perm_user` varchar(5) NOT NULL,
- `sys_perm_group` varchar(5) NOT NULL,
- `sys_perm_other` varchar(5) NOT NULL,
+ `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
+ `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
+ `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
+ `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
+ `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
`server_id` int(11) NOT NULL default '1',
- `origin` varchar(255) NOT NULL,
- `ns` varchar(255) NOT NULL,
- `mbox` varchar(255) NOT NULL,
+ `origin` varchar(255) NOT NULL DEFAULT '',
+ `ns` varchar(255) NOT NULL DEFAULT '',
+ `mbox` varchar(255) NOT NULL DEFAULT '',
`serial` int(11) unsigned NOT NULL default '1',
`refresh` int(11) unsigned NOT NULL default '28800',
`retry` int(11) unsigned NOT NULL default '7200',
`expire` int(11) unsigned NOT NULL default '604800',
`minimum` int(11) unsigned NOT NULL default '86400',
`ttl` int(11) unsigned NOT NULL default '86400',
- `active` enum('N','Y') NOT NULL,
- `xfer` varchar(255) NOT NULL,
+ `active` enum('N','Y') NOT NULL DEFAULT 'N',
+ `xfer` varchar(255) NOT NULL DEFAULT '',
`also_notify` varchar(255) default NULL,
`update_acl` varchar(255) default NULL,
PRIMARY KEY (`id`),
@@ -676,9 +678,9 @@
`sys_perm_group` varchar(5) NOT NULL default '',
`sys_perm_other` varchar(5) NOT NULL default '',
`server_id` int(11) NOT NULL default '0',
- `source` varchar(255) NOT NULL,
- `access` varchar(255) NOT NULL,
- `type` set('recipient','sender','client') NOT NULL,
+ `source` varchar(255) NOT NULL DEFAULT '',
+ `access` varchar(255) NOT NULL DEFAULT '',
+ `type` set('recipient','sender','client') NOT NULL DEFAULT 'recipient',
`active` enum('n','y') NOT NULL default 'y',
PRIMARY KEY (`access_id`),
KEY `server_id` (`server_id`,`source`)
@@ -692,13 +694,13 @@
CREATE TABLE `mail_backup` (
`backup_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `server_id` int(10) unsigned NOT NULL,
- `parent_domain_id` int(10) unsigned NOT NULL,
- `mailuser_id` int(10) unsigned NOT NULL,
+ `server_id` int(10) unsigned NOT NULL DEFAULT '0',
+ `parent_domain_id` int(10) unsigned NOT NULL DEFAULT '0',
+ `mailuser_id` int(10) unsigned NOT NULL DEFAULT '0',
`backup_mode` varchar(64) NOT NULL DEFAULT '',
- `tstamp` int(10) unsigned NOT NULL,
- `filename` varchar(255) NOT NULL,
- `filesize` VARCHAR(10) NOT NULL,
+ `tstamp` int(10) unsigned NOT NULL DEFAULT '0',
+ `filename` varchar(255) NOT NULL DEFAULT '',
+ `filesize` VARCHAR(10) NOT NULL DEFAULT '',
PRIMARY KEY (`backup_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -740,9 +742,10 @@
`server_id` int(11) unsigned NOT NULL default '0',
`domain` varchar(255) NOT NULL default '',
`dkim` ENUM( 'n', 'y' ) NOT NULL default 'n',
+ `dkim_selector` varchar(63) NOT NULL DEFAULT 'default',
`dkim_private` mediumtext NULL,
`dkim_public` mediumtext NULL,
- `active` enum('n','y') NOT NULL,
+ `active` enum('n','y') NOT NULL DEFAULT 'n',
PRIMARY KEY (`domain_id`),
KEY `server_id` (`server_id`,`domain`),
KEY `domain_active` (`domain`,`active`)
@@ -762,10 +765,10 @@
`sys_perm_group` varchar(5) NOT NULL default '',
`sys_perm_other` varchar(5) NOT NULL default '',
`server_id` int(11) unsigned NOT NULL default '0',
- `source` varchar(255) NOT NULL,
+ `source` varchar(255) NOT NULL DEFAULT '',
`destination` text,
`type` enum('alias','aliasdomain','forward','catchall') NOT NULL default 'alias',
- `active` enum('n','y') NOT NULL,
+ `active` enum('n','y') NOT NULL DEFAULT 'n',
PRIMARY KEY (`forwarding_id`),
KEY `server_id` (`server_id`,`source`),
KEY `type` (`type`)
@@ -806,14 +809,14 @@
`mailinglist_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) NOT NULL,
- `sys_perm_group` varchar(5) NOT NULL,
- `sys_perm_other` varchar(5) NOT NULL,
+ `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
+ `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
+ `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
`server_id` int(11) unsigned NOT NULL default '0',
- `domain` varchar(255) NOT NULL,
- `listname` varchar(255) NOT NULL,
- `email` varchar(255) NOT NULL,
- `password` varchar(255) NOT NULL,
+ `domain` varchar(255) NOT NULL DEFAULT '',
+ `listname` varchar(255) NOT NULL DEFAULT '',
+ `email` varchar(255) NOT NULL DEFAULT '',
+ `password` varchar(255) NOT NULL DEFAULT '',
PRIMARY KEY (`mailinglist_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -845,9 +848,9 @@
CREATE TABLE `mail_traffic` (
`traffic_id` int(11) unsigned NOT NULL auto_increment,
- `mailuser_id` int(11) unsigned NOT NULL,
- `month` char(7) NOT NULL,
- `traffic` bigint(20) unsigned NOT NULL,
+ `mailuser_id` int(11) unsigned NOT NULL DEFAULT '0',
+ `month` char(7) NOT NULL DEFAULT '',
+ `traffic` bigint(20) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`traffic_id`),
KEY `mailuser_id` (`mailuser_id`,`month`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -867,9 +870,9 @@
`sys_perm_other` varchar(5) NOT NULL default '',
`server_id` int(11) unsigned NOT NULL default '0',
`domain` varchar(255) NOT NULL default '',
- `transport` varchar(255) NOT NULL,
+ `transport` varchar(255) NOT NULL DEFAULT '',
`sort_order` int(11) unsigned NOT NULL default '5',
- `active` enum('n','y') NOT NULL,
+ `active` enum('n','y') NOT NULL DEFAULT 'n',
PRIMARY KEY (`transport_id`),
KEY `server_id` (`server_id`,`transport`),
KEY `server_id_2` (`server_id`,`domain`)
@@ -890,15 +893,15 @@
`sys_perm_other` varchar(5) NOT NULL default '',
`server_id` int(11) unsigned NOT NULL default '0',
`email` varchar(255) NOT NULL default '',
- `login` varchar(255) NOT NULL,
- `password` varchar(255) NOT NULL,
+ `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',
`maildir` varchar(255) NOT NULL default '',
`quota` bigint(20) NOT NULL default '-1',
`cc` varchar(255) NOT NULL default '',
- `homedir` varchar(255) NOT NULL,
+ `homedir` varchar(255) NOT NULL default '',
`autoresponder` enum('n','y') NOT NULL default 'n',
`autoresponder_start_date` datetime NOT NULL default '0000-00-00 00:00:00',
`autoresponder_end_date` datetime NOT NULL default '0000-00-00 00:00:00',
@@ -906,8 +909,8 @@
`autoresponder_text` mediumtext NULL,
`move_junk` enum('n','y') NOT NULL default 'n',
`custom_mailfilter` mediumtext,
- `postfix` enum('n','y') NOT NULL,
- `access` enum('n','y') NOT NULL,
+ `postfix` enum('n','y') NOT NULL default 'y',
+ `access` enum('n','y') NOT NULL default 'y',
`disableimap` enum('n','y') NOT NULL default 'n',
`disablepop3` enum('n','y') NOT NULL default 'n',
`disabledeliver` enum('n','y') NOT NULL default 'n',
@@ -956,10 +959,10 @@
--
CREATE TABLE `monitor_data` (
- `server_id` int(11) unsigned NOT NULL,
- `type` varchar(255) NOT NULL,
- `created` int(11) unsigned NOT NULL,
- `data` mediumtext NOT NULL,
+ `server_id` int(11) unsigned NOT NULL default '0',
+ `type` varchar(255) NOT NULL default '',
+ `created` int(11) unsigned NOT NULL default '0',
+ `data` mediumtext,
`state` enum('no_state','unknown','ok','info','warning','critical','error') NOT NULL DEFAULT 'unknown',
PRIMARY KEY (`server_id`,`type`,`created`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
@@ -1002,7 +1005,7 @@
`sys_perm_group` varchar(5) DEFAULT NULL,
`sys_perm_other` varchar(5) DEFAULT NULL,
`template_name` varchar(255) DEFAULT NULL,
- `template_file` varchar(255) NOT NULL,
+ `template_file` varchar(255) NOT NULL DEFAULT '',
`server_id` int(11) NOT NULL DEFAULT '0',
`allservers` varchar(255) NOT NULL DEFAULT 'y',
`active` varchar(255) NOT NULL DEFAULT 'y',
@@ -1083,8 +1086,8 @@
--
CREATE TABLE IF NOT EXISTS `openvz_traffic` (
- `veid` int(11) NOT NULL,
- `traffic_date` date NOT NULL,
+ `veid` int(11) NOT NULL DEFAULT '0',
+ `traffic_date` date NOT NULL DEFAULT '0000-00-00',
`traffic_bytes` bigint(32) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`veid`,`traffic_date`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -1108,15 +1111,15 @@
`sys_perm_group` varchar(5) DEFAULT NULL,
`sys_perm_other` varchar(5) DEFAULT NULL,
`server_id` int(11) NOT NULL DEFAULT '0',
- `veid` int(10) unsigned NOT NULL,
+ `veid` int(10) unsigned NOT NULL DEFAULT '0',
`ostemplate_id` int(11) NOT NULL DEFAULT '0',
`template_id` int(11) NOT NULL DEFAULT '0',
- `ip_address` varchar(255) NOT NULL,
+ `ip_address` varchar(255) NOT NULL DEFAULT '',
`hostname` varchar(255) DEFAULT NULL,
`vm_password` varchar(255) DEFAULT NULL,
`start_boot` varchar(255) NOT NULL DEFAULT 'y',
`active` varchar(255) NOT NULL DEFAULT 'y',
- `active_until_date` date NOT NULL,
+ `active_until_date` date NOT NULL DEFAULT '0000-00-00',
`description` text,
`diskspace` int(11) NOT NULL DEFAULT '0',
`traffic` int(11) NOT NULL DEFAULT '-1',
@@ -1129,8 +1132,8 @@
`io_priority` int(11) NOT NULL DEFAULT '4',
`nameserver` varchar(255) NOT NULL DEFAULT '8.8.8.8 8.8.4.4',
`create_dns` varchar(1) NOT NULL DEFAULT 'n',
- `capability` text NOT NULL,
- `config` mediumtext NOT NULL,
+ `capability` text,
+ `config` mediumtext,
PRIMARY KEY (`vm_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
@@ -1145,11 +1148,11 @@
--
CREATE TABLE `remote_session` (
- `remote_session` varchar(64) NOT NULL,
- `remote_userid` int(11) unsigned NOT NULL,
- `remote_functions` text NOT NULL,
+ `remote_session` varchar(64) NOT NULL DEFAULT '',
+ `remote_userid` int(11) unsigned NOT NULL DEFAULT '0',
+ `remote_functions` text,
`client_login` tinyint(1) unsigned NOT NULL default '0',
- `tstamp` int(10) unsigned NOT NULL,
+ `tstamp` int(10) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`remote_session`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
@@ -1166,9 +1169,9 @@
`sys_perm_user` varchar(5) default NULL,
`sys_perm_group` varchar(5) default NULL,
`sys_perm_other` varchar(5) default NULL,
- `remote_username` varchar(64) NOT NULL,
- `remote_password` varchar(64) NOT NULL,
- `remote_functions` text NOT NULL,
+ `remote_username` varchar(64) NOT NULL DEFAULT '',
+ `remote_password` varchar(64) NOT NULL DEFAULT '',
+ `remote_functions` text,
PRIMARY KEY (`remote_userid`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -1194,7 +1197,7 @@
`vserver_server` tinyint(1) NOT NULL default '0',
`proxy_server` tinyint(1) NOT NULL default '0',
`firewall_server` tinyint(1) NOT NULL default '0',
- `config` text NOT NULL,
+ `config` text,
`updated` bigint(20) unsigned NOT NULL default '0',
`mirror_server_id` int(11) unsigned NOT NULL default '0',
`dbversion` int(11) unsigned NOT NULL default '1',
@@ -1273,8 +1276,8 @@
`pgroup` varchar(255) default NULL,
`shell` varchar(255) NOT NULL default '/bin/bash',
`dir` varchar(255) default NULL,
- `chroot` varchar(255) NOT NULL,
- `ssh_rsa` text NOT NULL,
+ `chroot` varchar(255) NOT NULL DEFAULT '',
+ `ssh_rsa` text,
PRIMARY KEY (`shell_user_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -1286,16 +1289,16 @@
CREATE TABLE `software_package` (
`package_id` int(11) unsigned NOT NULL auto_increment,
- `software_repo_id` int(11) unsigned NOT NULL,
- `package_name` varchar(64) NOT NULL,
- `package_title` varchar(64) NOT NULL,
+ `software_repo_id` int(11) unsigned NOT NULL DEFAULT '0',
+ `package_name` varchar(64) NOT NULL DEFAULT '',
+ `package_title` varchar(64) NOT NULL DEFAULT '',
`package_description` text,
`package_version` varchar(8) default NULL,
`package_type` enum('ispconfig','app','web') NOT NULL default 'app',
`package_installable` enum('yes','no','key') NOT NULL default 'yes',
`package_requires_db` enum('no','mysql') NOT NULL default 'no',
`package_remote_functions` text,
- `package_key` varchar(255) NOT NULL,
+ `package_key` varchar(255) NOT NULL DEFAULT '',
`package_config` text,
PRIMARY KEY (`package_id`),
UNIQUE KEY `package_name` (`package_name`)
@@ -1330,12 +1333,12 @@
CREATE TABLE `software_update` (
`software_update_id` int(11) unsigned NOT NULL auto_increment,
- `software_repo_id` int(11) unsigned NOT NULL,
- `package_name` varchar(64) NOT NULL,
- `update_url` varchar(255) NOT NULL,
- `update_md5` varchar(255) NOT NULL,
- `update_dependencies` varchar(255) NOT NULL,
- `update_title` varchar(64) NOT NULL,
+ `software_repo_id` int(11) unsigned NOT NULL DEFAULT '0',
+ `package_name` varchar(64) NOT NULL DEFAULT '',
+ `update_url` varchar(255) NOT NULL DEFAULT '',
+ `update_md5` varchar(255) NOT NULL DEFAULT '',
+ `update_dependencies` varchar(255) NOT NULL DEFAULT '',
+ `update_title` varchar(64) NOT NULL DEFAULT '',
`v1` tinyint(1) NOT NULL default '0',
`v2` tinyint(1) NOT NULL default '0',
`v3` tinyint(1) NOT NULL default '0',
@@ -1353,8 +1356,8 @@
CREATE TABLE `software_update_inst` (
`software_update_inst_id` int(11) unsigned NOT NULL auto_increment,
`software_update_id` int(11) unsigned NOT NULL default '0',
- `package_name` varchar(64) NOT NULL,
- `server_id` int(11) unsigned NOT NULL,
+ `package_name` varchar(64) NOT NULL DEFAULT '',
+ `server_id` int(11) unsigned NOT NULL DEFAULT '0',
`status` enum('none','installing','installed','deleting','deleted','failed') NOT NULL default 'none',
PRIMARY KEY (`software_update_inst_id`),
UNIQUE KEY `software_update_id` (`software_update_id`,`package_name`,`server_id`)
@@ -1368,11 +1371,11 @@
CREATE TABLE `spamfilter_policy` (
`id` int(11) unsigned NOT NULL auto_increment,
- `sys_userid` int(11) unsigned NOT NULL,
- `sys_groupid` int(11) unsigned NOT NULL,
- `sys_perm_user` varchar(5) NOT NULL,
- `sys_perm_group` varchar(5) NOT NULL,
- `sys_perm_other` varchar(5) NOT NULL,
+ `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
+ `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
+ `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
+ `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
+ `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
`policy_name` varchar(64) default NULL,
`virus_lover` enum('N','Y') default NULL,
`spam_lover` enum('N','Y') default NULL,
@@ -1426,15 +1429,15 @@
CREATE TABLE `spamfilter_users` (
`id` int(11) unsigned NOT NULL auto_increment,
- `sys_userid` int(11) unsigned NOT NULL,
- `sys_groupid` int(11) unsigned NOT NULL,
- `sys_perm_user` varchar(5) NOT NULL,
- `sys_perm_group` varchar(5) NOT NULL,
- `sys_perm_other` varchar(5) NOT NULL,
- `server_id` int(11) unsigned NOT NULL,
+ `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
+ `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
+ `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
+ `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
+ `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
+ `server_id` int(11) unsigned NOT NULL DEFAULT '0',
`priority` tinyint(3) unsigned NOT NULL default '7',
`policy_id` int(11) unsigned NOT NULL default '1',
- `email` varchar(255) NOT NULL,
+ `email` varchar(255) NOT NULL DEFAULT '',
`fullname` varchar(64) default NULL,
`local` varchar(1) default NULL,
PRIMARY KEY (`id`),
@@ -1449,16 +1452,16 @@
CREATE TABLE `spamfilter_wblist` (
`wblist_id` int(11) unsigned NOT NULL auto_increment,
- `sys_userid` int(11) unsigned NOT NULL,
- `sys_groupid` int(11) unsigned NOT NULL,
- `sys_perm_user` varchar(5) NOT NULL,
- `sys_perm_group` varchar(5) NOT NULL,
- `sys_perm_other` varchar(5) NOT NULL,
- `server_id` int(11) unsigned NOT NULL,
+ `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
+ `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
+ `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
+ `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
+ `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
+ `server_id` int(11) unsigned NOT NULL DEFAULT '0',
`wb` enum('W','B') NOT NULL default 'W',
- `rid` int(11) unsigned NOT NULL,
- `email` varchar(255) NOT NULL,
- `priority` tinyint(3) unsigned NOT NULL,
+ `rid` int(11) unsigned NOT NULL DEFAULT '0',
+ `email` varchar(255) NOT NULL DEFAULT '',
+ `priority` tinyint(3) unsigned NOT NULL DEFAULT '0',
`active` enum('y','n') NOT NULL default 'y',
PRIMARY KEY (`wblist_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -1491,9 +1494,9 @@
--
CREATE TABLE `sys_config` (
- `group` varchar(64) NOT NULL,
- `name` varchar(64) NOT NULL,
- `value` varchar(255) NOT NULL,
+ `group` varchar(64) NOT NULL DEFAULT '',
+ `name` varchar(64) NOT NULL DEFAULT '',
+ `value` varchar(255) NOT NULL DEFAULT '',
PRIMARY KEY (`group`, `name`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -1505,7 +1508,7 @@
--
CREATE TABLE IF NOT EXISTS `sys_cron` (
- `name` varchar(50) NOT NULL,
+ `name` varchar(50) NOT NULL DEFAULT '',
`last_run` datetime NULL DEFAULT NULL,
`next_run` datetime NULL DEFAULT NULL,
`running` tinyint(1) UNSIGNED NOT NULL DEFAULT '0',
@@ -1521,13 +1524,13 @@
CREATE TABLE `sys_datalog` (
`datalog_id` int(11) unsigned NOT NULL auto_increment,
- `server_id` int(11) unsigned NOT NULL,
+ `server_id` int(11) unsigned NOT NULL DEFAULT '0',
`dbtable` varchar(255) NOT NULL default '',
`dbidx` varchar(255) NOT NULL default '',
`action` char(1) NOT NULL default '',
`tstamp` int(11) NOT NULL default '0',
`user` varchar(255) NOT NULL default '',
- `data` longtext NOT NULL,
+ `data` longtext,
`status` set('pending','ok','warning','error') NOT NULL default 'ok',
`error` mediumtext,
PRIMARY KEY (`datalog_id`),
@@ -1587,7 +1590,7 @@
CREATE TABLE `sys_group` (
`groupid` int(11) unsigned NOT NULL auto_increment,
`name` varchar(64) NOT NULL default '',
- `description` text NOT NULL,
+ `description` text,
`client_id` int(11) unsigned NOT NULL default '0',
PRIMARY KEY (`groupid`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -1600,7 +1603,7 @@
CREATE TABLE `sys_ini` (
`sysini_id` int(11) unsigned NOT NULL auto_increment,
- `config` longtext NOT NULL,
+ `config` longtext,
PRIMARY KEY (`sysini_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -1615,7 +1618,7 @@
`server_id` int(11) unsigned NOT NULL default '0',
`datalog_id` int(11) unsigned NOT NULL default '0',
`loglevel` tinyint(4) NOT NULL default '0',
- `tstamp` int(11) unsigned NOT NULL,
+ `tstamp` int(11) unsigned NOT NULL DEFAULT '0',
`message` text,
PRIMARY KEY (`syslog_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -1628,12 +1631,12 @@
CREATE TABLE `sys_remoteaction` (
`action_id` int(11) unsigned NOT NULL AUTO_INCREMENT,
- `server_id` int(11) unsigned NOT NULL,
- `tstamp` int(11) NOT NULL,
- `action_type` varchar(20) NOT NULL,
- `action_param` mediumtext NOT NULL,
- `action_state` enum('pending','ok','warning','error') NOT NULL,
- `response` mediumtext NOT NULL,
+ `server_id` int(11) unsigned NOT NULL DEFAULT '0',
+ `tstamp` int(11) NOT NULL DEFAULT '0',
+ `action_type` varchar(20) NOT NULL DEFAULT '',
+ `action_param` mediumtext,
+ `action_state` enum('pending','ok','warning','error') NOT NULL DEFAULT 'pending',
+ `response` mediumtext,
PRIMARY KEY (`action_id`),
KEY `server_id` (`server_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -1667,9 +1670,9 @@
`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,
- `logo_url` varchar(255) NOT NULL,
+ `tpl_name` varchar(32) NOT NULL DEFAULT '',
+ `username` varchar(64) NOT NULL DEFAULT '',
+ `logo_url` varchar(255) NOT NULL DEFAULT '',
PRIMARY KEY (`var_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
@@ -1694,7 +1697,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,
+ `groups` TEXT,
`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 '',
@@ -1733,13 +1736,13 @@
CREATE TABLE `web_backup` (
`backup_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
- `server_id` int(10) unsigned NOT NULL,
- `parent_domain_id` int(10) unsigned NOT NULL,
+ `server_id` int(10) unsigned NOT NULL DEFAULT '0',
+ `parent_domain_id` int(10) unsigned NOT NULL DEFAULT '0',
`backup_type` enum('web','mysql','mongodb') NOT NULL DEFAULT 'web',
`backup_mode` varchar(64) NOT NULL DEFAULT '',
- `tstamp` int(10) unsigned NOT NULL,
- `filename` varchar(255) NOT NULL,
- `filesize` VARCHAR(10) NOT NULL,
+ `tstamp` int(10) unsigned NOT NULL DEFAULT '0',
+ `filename` varchar(255) NOT NULL DEFAULT '',
+ `filesize` VARCHAR(10) NOT NULL DEFAULT '',
PRIMARY KEY (`backup_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -1762,11 +1765,12 @@
`database_name` varchar(64) DEFAULT NULL,
`database_name_prefix` varchar(50) NOT NULL default '',
`database_quota` int(11) unsigned DEFAULT NULL,
+ `last_quota_notification` date NULL default NULL,
`database_user_id` int(11) unsigned DEFAULT NULL,
`database_ro_user_id` int(11) unsigned DEFAULT NULL,
`database_charset` varchar(64) DEFAULT NULL,
`remote_access` enum('n','y') NOT NULL DEFAULT 'y',
- `remote_ips` text NOT NULL,
+ `remote_ips` text,
`backup_interval` VARCHAR( 255 ) NOT NULL DEFAULT 'none',
`backup_copies` INT NOT NULL DEFAULT '1',
`active` enum('n','y') NOT NULL DEFAULT 'y',
@@ -1852,7 +1856,7 @@
`allow_override` varchar(255) NOT NULL default 'All',
`apache_directives` mediumtext,
`nginx_directives` mediumtext,
- `php_fpm_use_socket` ENUM('n','y') NOT NULL DEFAULT 'n',
+ `php_fpm_use_socket` ENUM('n','y') NOT NULL DEFAULT 'y',
`pm` enum('static','dynamic','ondemand') NOT NULL DEFAULT 'dynamic',
`pm_max_children` int(11) NOT NULL DEFAULT '10',
`pm_start_servers` int(11) NOT NULL DEFAULT '2',
@@ -1934,8 +1938,8 @@
--
CREATE TABLE `web_traffic` (
- `hostname` varchar(255) NOT NULL,
- `traffic_date` date NOT NULL,
+ `hostname` varchar(255) NOT NULL DEFAULT '',
+ `traffic_date` date NOT NULL DEFAULT '0000-00-00',
`traffic_bytes` bigint(32) unsigned NOT NULL default '0',
PRIMARY KEY (`hostname`,`traffic_date`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
--
Gitblit v1.9.1