From 49441bdd0f3ff75d5092d5b832b97ea722a66363 Mon Sep 17 00:00:00 2001 From: Marius Burkard <m.burkard@pixcept.de> Date: Fri, 01 Jul 2016 03:53:30 -0400 Subject: [PATCH] Merge branch 'stable-3.1' --- install/sql/ispconfig3.sql | 569 ++++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 382 insertions(+), 187 deletions(-) diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql index 2e0d3de..eaf060a 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 ; @@ -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, @@ -158,7 +159,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 +170,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` text, `limit_maildomain` int(11) NOT NULL DEFAULT '-1', `limit_mailbox` int(11) NOT NULL DEFAULT '-1', `limit_mailalias` int(11) NOT NULL DEFAULT '-1', @@ -183,12 +184,24 @@ `limit_spamfilter_wblist` int(11) NOT NULL DEFAULT '0', `limit_spamfilter_user` int(11) NOT NULL DEFAULT '0', `limit_spamfilter_policy` int(11) NOT NULL DEFAULT '0', + `default_xmppserver` int(11) unsigned NOT NULL DEFAULT '1', + `xmpp_servers` text, + `limit_xmpp_domain` int(11) NOT NULL DEFAULT '-1', + `limit_xmpp_user` int(11) NOT NULL DEFAULT '-1', + `limit_xmpp_muc` ENUM( 'n', 'y' ) NOT NULL default 'n', + `limit_xmpp_anon` ENUM( 'n', 'y' ) NOT NULL default 'n', + `limit_xmpp_auth_options` varchar(255) NOT NULL DEFAULT 'plain,hashed,isp', + `limit_xmpp_vjud` ENUM( 'n', 'y' ) NOT NULL default 'n', + `limit_xmpp_proxy` ENUM( 'n', 'y' ) NOT NULL default 'n', + `limit_xmpp_status` ENUM( 'n', 'y' ) NOT NULL default 'n', + `limit_xmpp_pastebin` ENUM( 'n', 'y' ) NOT NULL default 'n', + `limit_xmpp_httparchive` ENUM( 'n', 'y' ) NOT NULL default 'n', `default_webserver` int(11) unsigned NOT NULL DEFAULT '1', - `web_servers` blob NOT NULL, + `web_servers` text, `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,php-fpm', + `web_php_options` varchar(255) NOT NULL DEFAULT 'no,fast-cgi,cgi,mod,suphp,php-fpm,hhvm', `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', @@ -198,22 +211,26 @@ `limit_hterror` enum('n','y') NOT NULL DEFAULT 'n', `limit_wildcard` enum('n','y') NOT NULL DEFAULT 'n', `limit_ssl` enum('n','y') NOT NULL DEFAULT 'n', + `limit_ssl_letsencrypt` enum('n','y') NOT NULL DEFAULT 'n', `limit_web_subdomain` int(11) NOT NULL DEFAULT '-1', `limit_web_aliasdomain` int(11) NOT NULL DEFAULT '-1', `limit_ftp_user` int(11) NOT NULL DEFAULT '-1', `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_directive_snippets` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n', `limit_aps` int(11) NOT NULL DEFAULT '-1', `default_dnsserver` int(11) unsigned NOT NULL DEFAULT '1', - `db_servers` blob NOT NULL, + `db_servers` text, `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` text, `limit_database` int(11) NOT NULL DEFAULT '-1', + `limit_database_user` int(11) NOT NULL DEFAULT '-1', `limit_database_quota` int(11) NOT NULL default '-1', `limit_cron` int(11) NOT NULL DEFAULT '0', `limit_cron_type` enum('url','chrooted','full') NOT NULL DEFAULT 'url', @@ -230,7 +247,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', @@ -238,11 +255,14 @@ `tmp_data` mediumblob, `id_rsa` varchar(2000) NOT NULL DEFAULT '', `ssh_rsa` varchar(600) NOT NULL DEFAULT '', - `customer_no_template` varchar(255) DEFAULT 'C[CUSTOMER_NO]', + `customer_no_template` varchar(255) DEFAULT 'R[CLIENTID]C[CUSTOMER_NO]', `customer_no_start` int(11) NOT NULL DEFAULT '1', `customer_no_counter` int(11) NOT NULL DEFAULT '0', - `added_date` date NOT NULL DEFAULT '0000-00-00', + `added_date` date NULL DEFAULT NULL, `added_by` varchar(255) DEFAULT NULL, + `validation_status` enum('accept','review','reject') NOT NULL DEFAULT 'accept', + `risk_score` int(10) unsigned NOT NULL DEFAULT '0', + `activation_code` varchar(10) NOT NULL DEFAULT '', PRIMARY KEY (`client_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -279,8 +299,9 @@ `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', + `mail_servers` text, `limit_maildomain` int(11) NOT NULL default '-1', `limit_mailbox` int(11) NOT NULL default '-1', `limit_mailalias` int(11) NOT NULL default '-1', @@ -294,6 +315,18 @@ `limit_spamfilter_wblist` int(11) NOT NULL default '0', `limit_spamfilter_user` int(11) NOT NULL default '0', `limit_spamfilter_policy` int(11) NOT NULL default '0', + `default_xmppserver` int(11) unsigned NOT NULL DEFAULT '1', + `xmpp_servers` text, + `limit_xmpp_domain` int(11) NOT NULL DEFAULT '-1', + `limit_xmpp_user` int(11) NOT NULL DEFAULT '-1', + `limit_xmpp_muc` ENUM( 'n', 'y' ) NOT NULL default 'n', + `limit_xmpp_anon` ENUM( 'n', 'y' ) NOT NULL default 'n', + `limit_xmpp_vjud` ENUM( 'n', 'y' ) NOT NULL default 'n', + `limit_xmpp_proxy` ENUM( 'n', 'y' ) NOT NULL default 'n', + `limit_xmpp_status` ENUM( 'n', 'y' ) NOT NULL default 'n', + `limit_xmpp_pastebin` ENUM( 'n', 'y' ) NOT NULL default 'n', + `limit_xmpp_httparchive` ENUM( 'n', 'y' ) NOT NULL default 'n', + `web_servers` text, `limit_web_ip` text, `limit_web_domain` int(11) NOT NULL default '-1', `limit_web_quota` int(11) NOT NULL default '-1', @@ -307,17 +340,24 @@ `limit_hterror` enum('n','y') NOT NULL DEFAULT 'n', `limit_wildcard` enum('n','y') NOT NULL DEFAULT 'n', `limit_ssl` enum('n','y') NOT NULL DEFAULT 'n', + `limit_ssl_letsencrypt` enum('n','y') NOT NULL DEFAULT 'n', `limit_web_subdomain` int(11) NOT NULL default '-1', `limit_web_aliasdomain` int(11) NOT NULL default '-1', `limit_ftp_user` int(11) NOT NULL default '-1', `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_directive_snippets` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n', `limit_aps` int(11) NOT NULL DEFAULT '-1', + `dns_servers` text, `limit_dns_zone` int(11) NOT NULL default '-1', + `default_slave_dnsserver` int(11) NOT NULL DEFAULT '0', `limit_dns_slave_zone` int(11) NOT NULL default '-1', `limit_dns_record` int(11) NOT NULL default '-1', + `db_servers` text, `limit_database` int(11) NOT NULL default '-1', + `limit_database_user` int(11) NOT NULL DEFAULT '-1', `limit_database_quota` int(11) NOT NULL default '-1', `limit_cron` int(11) NOT NULL default '0', `limit_cron_type` enum('url','chrooted','full') NOT NULL default 'url', @@ -375,9 +415,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 +439,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, @@ -426,7 +466,10 @@ `name` varchar(255) DEFAULT NULL, `type` varchar(255) DEFAULT NULL, `snippet` mediumtext, + `customer_viewable` ENUM('n','y') NOT NULL DEFAULT 'n', + `required_php_snippets` varchar(255) NOT NULL DEFAULT '', `active` enum('n','y') NOT NULL DEFAULT 'y', + `master_directive_snippets_id` int(11) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`directive_snippets_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -438,18 +481,18 @@ 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, - `type` enum('A','AAAA','ALIAS','CNAME','HINFO','MX','NAPTR','NS','PTR','RP','SRV','TXT') default NULL, - `data` varchar(255) NOT NULL, + `zone` int(11) unsigned NOT NULL DEFAULT '0', + `name` varchar(255) NOT NULL DEFAULT '', + `type` enum('A','AAAA','ALIAS','CNAME','DS','HINFO','LOC','MX','NAPTR','NS','PTR','RP','SRV','TXT','TLSA','DNSKEY') default NULL, + `data` TEXT NOT NULL DEFAULT '', `aux` int(11) unsigned NOT NULL default '0', - `ttl` int(11) unsigned NOT NULL default '86400', + `ttl` int(11) unsigned NOT NULL default '3600', `active` enum('N','Y') NOT NULL default 'Y', `stamp` timestamp NOT NULL default CURRENT_TIMESTAMP, `serial` int(10) unsigned default NULL, @@ -465,16 +508,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,25 +531,29 @@ 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, + `minimum` int(11) unsigned NOT NULL default '3600', + `ttl` int(11) unsigned NOT NULL default '3600', + `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, + `dnssec_initialized` ENUM('Y','N') NOT NULL DEFAULT 'N', + `dnssec_wanted` ENUM('Y','N') NOT NULL DEFAULT 'N', + `dnssec_last_signed` BIGINT NOT NULL DEFAULT '0', + `dnssec_info` TEXT NULL, PRIMARY KEY (`id`), UNIQUE KEY `origin` (`origin`), KEY `active` (`active`) @@ -596,11 +643,26 @@ `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 NULL DEFAULT NULL, PRIMARY KEY (`ftp_user_id`), KEY `active` (`active`), KEY `server_id` (`server_id`), KEY `username` (`username`), KEY `quota_files` (`quota_files`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `ftp_traffic` +-- + +CREATE TABLE `ftp_traffic` ( + `hostname` varchar(255) NOT NULL, + `traffic_date` date NOT NULL, + `in_bytes` bigint(32) unsigned NOT NULL, + `out_bytes` bigint(32) unsigned NOT NULL, + UNIQUE KEY (`hostname`,`traffic_date`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; -- -------------------------------------------------------- @@ -676,9 +738,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 +754,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(20) NOT NULL DEFAULT '', PRIMARY KEY (`backup_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -740,9 +802,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 +825,12 @@ `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', + `allow_send_as` ENUM('n','y') NOT NULL DEFAULT 'n', + `greylisting` enum('n','y' ) NOT NULL DEFAULT 'n', PRIMARY KEY (`forwarding_id`), KEY `server_id` (`server_id`,`source`), KEY `type` (`type`) @@ -806,14 +871,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 +910,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 +932,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,24 +955,27 @@ `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', + `uid` int(11) NOT NULL default '5000', + `gid` int(11) NOT NULL default '5000', `maildir` varchar(255) NOT NULL default '', + `maildir_format` varchar(255) NOT NULL default 'maildir', `quota` bigint(20) NOT NULL default '-1', `cc` varchar(255) NOT NULL default '', - `homedir` varchar(255) NOT NULL, + `sender_cc` varchar(255) NOT NULL default '', + `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', + `autoresponder_start_date` datetime NULL default NULL, + `autoresponder_end_date` datetime NULL default NULL, `autoresponder_subject` varchar(255) NOT NULL default 'Out of office reply', `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', + `greylisting` enum('n','y' ) NOT NULL DEFAULT 'n', + `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 +1024,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 ; @@ -978,9 +1046,10 @@ `sys_perm_group` varchar(5) DEFAULT NULL, `sys_perm_other` varchar(5) DEFAULT NULL, `server_id` int(11) NOT NULL DEFAULT '0', - `ip_address` varchar(15) DEFAULT NULL, + `ip_address` varchar(39) DEFAULT NULL, `vm_id` int(11) NOT NULL DEFAULT '0', `reserved` varchar(255) NOT NULL DEFAULT 'n', + `additional` varchar(255) NOT NULL DEFAULT 'n', PRIMARY KEY (`ip_address_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ; @@ -1002,7 +1071,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', @@ -1067,6 +1136,9 @@ `nameserver` varchar(255) DEFAULT NULL, `create_dns` varchar(1) NOT NULL DEFAULT 'n', `capability` varchar(255) DEFAULT NULL, + `features` varchar(255) DEFAULT NULL, + `iptables` varchar(255) DEFAULT NULL, + `custom` text, PRIMARY KEY (`template_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ; @@ -1074,7 +1146,7 @@ -- Dumping data for table `openvz_template` -- -INSERT INTO `openvz_template` (`template_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `template_name`, `diskspace`, `traffic`, `bandwidth`, `ram`, `ram_burst`, `cpu_units`, `cpu_num`, `cpu_limit`, `io_priority`, `active`, `description`, `numproc`, `numtcpsock`, `numothersock`, `vmguarpages`, `kmemsize`, `tcpsndbuf`, `tcprcvbuf`, `othersockbuf`, `dgramrcvbuf`, `oomguarpages`, `privvmpages`, `lockedpages`, `shmpages`, `physpages`, `numfile`, `avnumproc`, `numflock`, `numpty`, `numsiginfo`, `dcachesize`, `numiptent`, `swappages`, `hostname`, `nameserver`, `create_dns`, `capability`) VALUES(1, 1, 1, 'riud', 'riud', '', 'small', 10, -1, -1, 256, 512, 1000, 4, 400, 4, 'y', '', '999999:999999', '7999992:7999992', '7999992:7999992', '65536:65536', '2147483646:2147483646', '214748160:396774400', '214748160:396774400', '214748160:396774400', '214748160:396774400', '65536:65536', '131072:131072', '999999:999999', '65536:65536', '0:2147483647', '23999976:23999976', '180:180', '999999:999999', '500000:500000', '999999:999999', '2147483646:2147483646', '999999:999999', '256000:256000', 'v{VEID}.test.tld', '8.8.8.8 8.8.4.4', 'n', ''); +INSERT INTO `openvz_template` (`template_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `template_name`, `diskspace`, `traffic`, `bandwidth`, `ram`, `ram_burst`, `cpu_units`, `cpu_num`, `cpu_limit`, `io_priority`, `active`, `description`, `numproc`, `numtcpsock`, `numothersock`, `vmguarpages`, `kmemsize`, `tcpsndbuf`, `tcprcvbuf`, `othersockbuf`, `dgramrcvbuf`, `oomguarpages`, `privvmpages`, `lockedpages`, `shmpages`, `physpages`, `numfile`, `avnumproc`, `numflock`, `numpty`, `numsiginfo`, `dcachesize`, `numiptent`, `swappages`, `hostname`, `nameserver`, `create_dns`, `capability`, `features`, `iptables`, `custom`) VALUES(1, 1, 1, 'riud', 'riud', '', 'small', 10, -1, -1, 256, 512, 1000, 4, 400, 4, 'y', '', '999999:999999', '7999992:7999992', '7999992:7999992', '65536:unlimited', '2147483646:2147483646', '214748160:396774400', '214748160:396774400', '214748160:396774400', '214748160:396774400', '65536:65536', '131072:139264', '999999:999999', '65536:65536', '0:2147483647', '23999976:23999976', '180:180', '999999:999999', '500000:500000', '999999:999999', '2147483646:2147483646', '999999:999999', '256000:256000', 'v{VEID}.test.tld', '8.8.8.8 8.8.4.4', 'n', '', '', '', ''); -- -------------------------------------------------------- @@ -1083,10 +1155,10 @@ -- 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 NULL DEFAULT NULL, `traffic_bytes` bigint(32) unsigned NOT NULL DEFAULT '0', - PRIMARY KEY (`veid`,`traffic_date`) + UNIQUE KEY (`veid`,`traffic_date`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- @@ -1108,15 +1180,16 @@ `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', + `bootorder` int(11) NOT NULL DEFAULT '1', `active` varchar(255) NOT NULL DEFAULT 'y', - `active_until_date` date NOT NULL, + `active_until_date` date NULL DEFAULT NULL, `description` text, `diskspace` int(11) NOT NULL DEFAULT '0', `traffic` int(11) NOT NULL DEFAULT '-1', @@ -1129,8 +1202,11 @@ `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, + `features` text, + `iptabless` text, + `config` mediumtext, + `custom` text, PRIMARY KEY (`vm_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ; @@ -1145,11 +1221,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 +1242,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 +1270,8 @@ `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, + `xmpp_server` tinyint(1) NOT NULL default '0', + `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', @@ -1226,6 +1303,25 @@ -- -------------------------------------------------------- +-- +-- Table structure for table `server_ip_map` +-- + +CREATE TABLE `server_ip_map` ( + `server_ip_map_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, + `server_id` int(11) unsigned NOT NULL DEFAULT '0', + `source_ip` varchar(15) DEFAULT NULL, + `destination_ip` varchar(35) DEFAULT '', + `active` enum('n','y') NOT NULL DEFAULT 'y', + PRIMARY KEY (`server_ip_map_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; + +-- -------------------------------------------------------- -- -- Table structure for table `server_php` @@ -1273,8 +1369,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 +1382,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 +1426,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 +1449,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 +1464,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 +1522,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 +1545,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 +1587,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 +1601,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 +1617,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 +1683,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 +1696,9 @@ CREATE TABLE `sys_ini` ( `sysini_id` int(11) unsigned NOT NULL auto_increment, - `config` longtext NOT NULL, + `config` longtext, + `default_logo` text NOT NULL, + `custom_logo` text NOT NULL, PRIMARY KEY (`sysini_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -1615,7 +1713,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 +1726,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 ; @@ -1646,8 +1744,8 @@ CREATE TABLE `sys_session` ( `session_id` varchar(64) NOT NULL DEFAULT '', - `date_created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `last_updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `date_created` datetime NULL DEFAULT NULL, + `last_updated` datetime NULL DEFAULT NULL, `permanent` enum('n','y') NOT NULL DEFAULT 'n', `session_data` longtext, PRIMARY KEY (`session_id`), @@ -1667,9 +1765,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,11 +1792,14 @@ `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 '', `ssh_rsa` VARCHAR( 600 ) NOT NULL default '', + `lost_password_function` tinyint(1) NOT NULL default '1', + `lost_password_hash` VARCHAR(50) NOT NULL default '', + `lost_password_reqtime` DATETIME NULL default NULL, PRIMARY KEY (`userid`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -1733,13 +1834,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(20) NOT NULL DEFAULT '', PRIMARY KEY (`backup_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; @@ -1762,11 +1863,13 @@ `database_name` varchar(64) DEFAULT NULL, `database_name_prefix` varchar(50) NOT NULL default '', `database_quota` int(11) unsigned DEFAULT NULL, + `quota_exceeded` enum('n','y') NOT NULL DEFAULT 'n', + `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', @@ -1835,7 +1938,9 @@ `redirect_type` varchar(255) default NULL, `redirect_path` varchar(255) default NULL, `seo_redirect` varchar(255) default NULL, + `rewrite_to_https` ENUM('y','n') NOT NULL DEFAULT 'n', `ssl` enum('n','y') NOT NULL default 'n', + `ssl_letsencrypt` enum('n','y') NOT NULL DEFAULT 'n', `ssl_state` varchar(255) NULL, `ssl_locality` varchar(255) NULL, `ssl_organisation` varchar(255) NULL, @@ -1852,7 +1957,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', @@ -1869,12 +1974,18 @@ `traffic_quota_lock` enum('n','y') NOT NULL default 'n', `fastcgi_php_version` varchar(255) DEFAULT NULL, `proxy_directives` mediumtext, + `enable_spdy` ENUM('y','n') NULL DEFAULT 'n', `last_quota_notification` date NULL default NULL, `rewrite_rules` mediumtext, - `added_date` date NOT NULL DEFAULT '0000-00-00', + `added_date` date NULL DEFAULT NULL, `added_by` varchar(255) DEFAULT NULL, + `directive_snippets_id` int(11) unsigned NOT NULL default '0', + `enable_pagespeed` ENUM('y','n') NOT NULL DEFAULT 'n', + `http_port` int(11) unsigned NOT NULL DEFAULT '80', + `https_port` int(11) unsigned NOT NULL DEFAULT '443', + `folder_directive_snippets` text NOT NULL, PRIMARY KEY (`domain_id`), - UNIQUE KEY `serverdomain` ( `server_id` , `domain` ) + UNIQUE KEY `serverdomain` ( `server_id` , `ip_address`, `domain` ) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; -- -------------------------------------------------------- @@ -1934,11 +2045,94 @@ -- CREATE TABLE `web_traffic` ( - `hostname` varchar(255) NOT NULL, - `traffic_date` date NOT NULL, + `hostname` varchar(255) NOT NULL DEFAULT '', + `traffic_date` date NULL DEFAULT NULL, `traffic_bytes` bigint(32) unsigned NOT NULL default '0', - PRIMARY KEY (`hostname`,`traffic_date`) + UNIQUE KEY (`hostname`,`traffic_date`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `xmpp_domain` +-- + +CREATE TABLE `xmpp_domain` ( + `domain_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 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 default '', + + `management_method` ENUM( 'normal', 'maildomain' ) NOT NULL default 'normal', + `public_registration` ENUM( 'n', 'y' ) NOT NULL default 'n', + `registration_url` varchar(255) NOT NULL DEFAULT '', + `registration_message` varchar(255) NOT NULL DEFAULT '', + `domain_admins` text, + + `use_pubsub` enum('n','y') NOT NULL DEFAULT 'n', + `use_proxy` enum('n','y') NOT NULL DEFAULT 'n', + `use_anon_host` enum('n','y') NOT NULL DEFAULT 'n', + + `use_vjud` enum('n','y') NOT NULL DEFAULT 'n', + `vjud_opt_mode` enum('in', 'out') NOT NULL DEFAULT 'in', + + `use_muc_host` enum('n','y') NOT NULL DEFAULT 'n', + `muc_name` varchar(30) NOT NULL DEFAULT '', + `muc_restrict_room_creation` enum('n', 'y', 'm') NOT NULL DEFAULT 'm', + `muc_admins` text, + `use_pastebin` enum('n','y') NOT NULL DEFAULT 'n', + `pastebin_expire_after` int(3) NOT NULL DEFAULT 48, + `pastebin_trigger` varchar(10) NOT NULL DEFAULT '!paste', + `use_http_archive` enum('n','y') NOT NULL DEFAULT 'n', + `http_archive_show_join` enum('n', 'y') NOT NULL DEFAULT 'n', + `http_archive_show_status` enum('n', 'y') NOT NULL DEFAULT 'n', + `use_status_host` enum('n','y') NOT NULL DEFAULT 'n', + + `ssl_state` varchar(255) NULL, + `ssl_locality` varchar(255) NULL, + `ssl_organisation` varchar(255) NULL, + `ssl_organisation_unit` varchar(255) NULL, + `ssl_country` varchar(255) NULL, + `ssl_email` varchar(255) NULL, + `ssl_request` mediumtext NULL, + `ssl_cert` mediumtext NULL, + `ssl_bundle` mediumtext NULL, + `ssl_key` mediumtext NULL, + `ssl_action` varchar(16) NULL, + + `active` enum('n','y') NOT NULL DEFAULT 'n', + PRIMARY KEY (`domain_id`), + KEY `server_id` (`server_id`,`domain`), + KEY `domain_active` (`domain`,`active`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `xmpp_user` +-- + +CREATE TABLE `xmpp_user` ( + `xmppuser_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 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', + `jid` varchar(255) NOT NULL default '', + `password` varchar(255) NOT NULL default '', + `active` enum('n','y') NOT NULL DEFAULT 'n', + PRIMARY KEY (`xmppuser_id`), + KEY `server_id` (`server_id`,`jid`), + KEY `jid_active` (`jid`,`active`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; + +-- -------------------------------------------------------- -- -------------------------------------------------------- -- -------------------------------------------------------- @@ -2208,7 +2402,8 @@ -- Dumping data for table `dns_template` -- -INSERT INTO `dns_template` (`template_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `name`, `fields`, `template`, `visible`) VALUES (1, 1, 1, 'riud', 'riud', '', 'Default', 'DOMAIN,IP,NS1,NS2,EMAIL', '[ZONE]\norigin={DOMAIN}.\nns={NS1}.\nmbox={EMAIL}.\nrefresh=7200\nretry=540\nexpire=604800\nminimum=86400\nttl=3600\n\n[DNS_RECORDS]\nA|{DOMAIN}.|{IP}|0|3600\nA|www|{IP}|0|3600\nA|mail|{IP}|0|3600\nNS|{DOMAIN}.|{NS1}.|0|3600\nNS|{DOMAIN}.|{NS2}.|0|3600\nMX|{DOMAIN}.|mail.{DOMAIN}.|10|3600', 'y'); +INSERT INTO `dns_template` (`template_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `name`, `fields`, `template`, `visible`) VALUES (1, 1, 1, 'riud', 'riud', '', 'Default', 'DOMAIN,IP,NS1,NS2,EMAIL,DKIM,DNSSEC', '[ZONE]\norigin={DOMAIN}.\nns={NS1}.\nmbox={EMAIL}.\nrefresh=7200\nretry=540\nexpire=604800\nminimum=3600\nttl=3600\n\n[DNS_RECORDS]\nA|{DOMAIN}.|{IP}|0|3600\nA|www|{IP}|0|3600\nA|mail|{IP}|0|3600\nNS|{DOMAIN}.|{NS1}.|0|3600\nNS|{DOMAIN}.|{NS2}.|0|3600\nMX|{DOMAIN}.|mail.{DOMAIN}.|10|3600\nTXT|{DOMAIN}.|v=spf1 mx a ~all|0|3600', 'y'); + -- -------------------------------------------------------- @@ -2262,7 +2457,7 @@ -- Dumping data for table `sys_ini` -- -INSERT INTO `sys_ini` (`sysini_id`, `config`) VALUES (1, ''); +INSERT INTO `sys_ini` (`sysini_id`, `config`, `default_logo`, `custom_logo`) VALUES (1, '', 'data:image/png;base64,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', ''); -- -------------------------------------------------------- @@ -2287,7 +2482,7 @@ -- Dumping data for table `sys_config` -- -INSERT INTO sys_config VALUES ('db','db_version','3.0.5.4rc1'); +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