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 | 56 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 35 insertions(+), 21 deletions(-)
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index fedb106..eaf060a 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -170,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,
+ `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',
@@ -185,7 +185,7 @@
`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,
+ `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',
@@ -197,7 +197,7 @@
`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,
+ `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',
@@ -211,6 +211,7 @@
`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',
@@ -218,16 +219,18 @@
`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,
+ `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,
+ `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',
@@ -252,10 +255,10 @@
`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',
@@ -298,6 +301,7 @@
`sys_perm_other` varchar(5) default 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',
@@ -312,7 +316,7 @@
`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,
+ `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',
@@ -322,6 +326,7 @@
`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',
@@ -335,6 +340,7 @@
`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',
@@ -342,11 +348,16 @@
`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',
@@ -632,7 +643,7 @@
`dl_ratio` int(11) NOT NULL default '-1',
`ul_bandwidth` int(11) NOT NULL default '-1',
`dl_bandwidth` int(11) NOT NULL default '-1',
- `expires` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+ `expires` datetime NULL DEFAULT NULL,
PRIMARY KEY (`ftp_user_id`),
KEY `active` (`active`),
KEY `server_id` (`server_id`),
@@ -651,7 +662,7 @@
`traffic_date` date NOT NULL,
`in_bytes` bigint(32) unsigned NOT NULL,
`out_bytes` bigint(32) unsigned NOT NULL,
- PRIMARY KEY (`hostname`,`traffic_date`)
+ UNIQUE KEY (`hostname`,`traffic_date`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
-- --------------------------------------------------------
@@ -956,8 +967,8 @@
`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',
@@ -1145,9 +1156,9 @@
CREATE TABLE IF NOT EXISTS `openvz_traffic` (
`veid` int(11) NOT NULL DEFAULT '0',
- `traffic_date` date NOT NULL DEFAULT '0000-00-00',
+ `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;
--
@@ -1178,7 +1189,7 @@
`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',
+ `active_until_date` date NULL DEFAULT NULL,
`description` text,
`diskspace` int(11) NOT NULL DEFAULT '0',
`traffic` int(11) NOT NULL DEFAULT '-1',
@@ -1733,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`),
@@ -1787,6 +1798,8 @@
`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 ;
@@ -1850,6 +1863,7 @@
`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,
@@ -1963,7 +1977,7 @@
`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',
@@ -2032,9 +2046,9 @@
CREATE TABLE `web_traffic` (
`hostname` varchar(255) NOT NULL DEFAULT '',
- `traffic_date` date NOT NULL DEFAULT '0000-00-00',
+ `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 ;
-- --------------------------------------------------------
@@ -2388,7 +2402,7 @@
-- 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,DKIM', '[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');
+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');
-- --------------------------------------------------------
--
Gitblit v1.9.1