From 6f138addf10bd99c44df464d43022ee6542e2ccb Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Thu, 18 Feb 2016 03:41:40 -0500
Subject: [PATCH] - removed doubled detect_ip() call (Fixes #3763)
---
install/sql/ispconfig3.sql | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 6a4a946..53d2753 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -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,6 +219,7 @@
`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,
@@ -335,6 +337,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,6 +345,7 @@
`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',
`limit_dns_zone` int(11) NOT NULL default '-1',
`limit_dns_slave_zone` int(11) NOT NULL default '-1',
@@ -478,7 +482,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','TLSA','DNSKEY') 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',
@@ -1787,6 +1791,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 ;
@@ -2468,7 +2474,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