From 486e424dfd1c57c4b4fef5c01319aca6d53cd7cf Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Thu, 11 Feb 2016 13:14:51 -0500
Subject: [PATCH] Merge branch 'stable-3.1'
---
install/sql/ispconfig3.sql | 48 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index df45246..68cf272 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -257,6 +257,9 @@
`customer_no_counter` int(11) NOT NULL DEFAULT '0',
`added_date` date NOT NULL DEFAULT '0000-00-00',
`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 ;
@@ -308,6 +311,17 @@
`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` blob,
+ `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',
`limit_web_ip` text,
`limit_web_domain` int(11) NOT NULL default '-1',
`limit_web_quota` int(11) NOT NULL default '-1',
@@ -444,6 +458,7 @@
`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 ;
@@ -463,7 +478,7 @@
`server_id` int(11) NOT NULL default '1',
`zone` int(11) unsigned NOT NULL DEFAULT '0',
`name` varchar(255) NOT NULL DEFAULT '',
- `type` enum('A','AAAA','ALIAS','CNAME','HINFO','MX','NAPTR','NS','PTR','RP','SRV','TXT') default NULL,
+ `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 '3600',
@@ -524,6 +539,10 @@
`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`)
@@ -619,6 +638,20 @@
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,
+ PRIMARY KEY (`hostname`,`traffic_date`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
-- --------------------------------------------------------
@@ -785,6 +818,8 @@
`destination` text,
`type` enum('alias','aliasdomain','forward','catchall') NOT NULL default 'alias',
`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`)
@@ -928,6 +963,7 @@
`move_junk` enum('n','y') NOT NULL default 'n',
`custom_mailfilter` mediumtext,
`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',
@@ -1002,6 +1038,7 @@
`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 ;
@@ -1090,6 +1127,7 @@
`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 ;
@@ -1097,7 +1135,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`, `features`, `iptables`) 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', '', '', '', '');
-- --------------------------------------------------------
@@ -1138,6 +1176,7 @@
`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 DEFAULT '0000-00-00',
`description` text,
@@ -1156,6 +1195,7 @@
`features` text,
`iptabless` text,
`config` mediumtext,
+ `custom` text,
PRIMARY KEY (`vm_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
@@ -1886,6 +1926,7 @@
`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,
@@ -1928,6 +1969,7 @@
`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` , `ip_address`, `domain` )
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -2426,7 +2468,7 @@
-- Dumping data for table `sys_config`
--
-INSERT INTO sys_config VALUES ('db','db_version','3.1dev');
+INSERT INTO sys_config VALUES ('db','db_version','3.1a1');
INSERT INTO sys_config VALUES ('interface','session_timeout','0');
SET FOREIGN_KEY_CHECKS = 1;
--
Gitblit v1.9.1