From e01f81c8cd2ca4f0cd489f0931491a0c2fc3bae0 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 07 Nov 2011 05:50:54 -0500
Subject: [PATCH] Removed 2 items from todo which have been implemented.
---
install/sql/ispconfig3.sql | 173 ++++++++++++++++++++++++---------------------------------
1 files changed, 72 insertions(+), 101 deletions(-)
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 498d86b..fd62648 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -131,7 +131,7 @@
`limit_client` int(11) NOT NULL DEFAULT '0',
`limit_mailmailinglist` int(11) NOT NULL DEFAULT '-1',
`limit_openvz_vm` int(11) NOT NULL DEFAULT '0',
- `limit_openvz_vm_template` int(11) NOT NULL DEFAULT '0',
+ `limit_openvz_vm_template_id` int(11) NOT NULL DEFAULT '0',
`parent_client_id` int(11) unsigned NOT NULL DEFAULT '0',
`username` varchar(64) DEFAULT NULL,
`password` varchar(64) DEFAULT NULL,
@@ -176,10 +176,12 @@
`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',
`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_dns_zone` int(11) NOT NULL default '-1',
`limit_dns_slave_zone` int(11) NOT NULL default '-1',
@@ -191,6 +193,8 @@
`limit_traffic_quota` int(11) NOT NULL default '-1',
`limit_client` int(11) NOT NULL default '0',
`limit_mailmailinglist` int(11) NOT NULL default '-1',
+ `limit_openvz_vm` int(11) NOT NULL DEFAULT '0',
+ `limit_openvz_vm_template_id` int(11) NOT NULL DEFAULT '0',
PRIMARY KEY (`template_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -369,66 +373,6 @@
`tcp_port` varchar(255) default NULL,
`udp_port` varchar(255) default NULL,
`active` enum('n','y') NOT NULL default 'y',
- PRIMARY KEY (`firewall_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `firewall_filter`
---
-
-CREATE TABLE `firewall_filter` (
- `firewall_id` int(11) unsigned NOT NULL auto_increment,
- `sys_userid` int(11) unsigned NOT NULL default '0',
- `domain_id` int(11) NOT NULL,
- `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',
- `rule_name` varchar(100) default NULL,
- `rule_id` int(11) default 1,
- `src_ip` varchar(20) NOT NULL,
- `src_netmask` varchar(20) NOT NULL,
- `dst_ip` varchar(20) NOT NULL,
- `dst_netmask` varchar(20) NOT NULL,
- `src_from_port` varchar(10) NOT NULL,
- `src_to_port` varchar(10) NOT NULL,
- `dst_to_port` varchar(10) NOT NULL,
- `dst_from_port` varchar(10) NOT NULL,
- `protocol` varchar(10) default 'tcp',
- `inbound_policy` enum('allow','deny','reject','limit') default 'allow',
- `outbound_policy` enum('allow','deny','reject','limit') default 'allow',
- `active` enum('n','y') NOT NULL default 'y',
- `client_id` int(11) NOT NULL,
- PRIMARY KEY (`firewall_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `firewall_forward`
---
-
-CREATE TABLE `firewall_forward` (
- `firewall_id` int(11) unsigned NOT NULL auto_increment,
- `sys_userid` int(11) unsigned NOT NULL default '0',
- `domain_id` int(11) NOT NULL,
- `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',
- `application_name` varchar(100) default NULL,
- `dst_ip` varchar(20) NOT NULL,
- `src_from_port` varchar(10) NOT NULL,
- `src_to_port` varchar(10) NOT NULL,
- `dst_to_port` varchar(10) NOT NULL,
- `dst_from_port` varchar(10) NOT NULL,
- `protocol` int(3) default 0,
- `active` enum('n','y') NOT NULL default 'y',
- `client_id` int(11) NOT NULL,
PRIMARY KEY (`firewall_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -640,23 +584,6 @@
-- --------------------------------------------------------
---
--- Table structure for table `mail_greylist`
---
-
-CREATE TABLE `mail_greylist` (
- `greylist_id` int(11) unsigned NOT NULL auto_increment,
- `relay_ip` varchar(39) default NULL,
- `from_domain` varchar(255) default NULL,
- `block_expires` datetime NOT NULL default '0000-00-00 00:00:00',
- `record_expires` datetime NOT NULL default '0000-00-00 00:00:00',
- `origin_type` enum('MANUAL','AUTO') NOT NULL default 'AUTO',
- `create_time` datetime NOT NULL default '0000-00-00 00:00:00',
- PRIMARY KEY (`greylist_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
-
--- --------------------------------------------------------
-
--
-- Tabellenstruktur für Tabelle `mail_mailinglist`
--
@@ -761,6 +688,7 @@
`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_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,
@@ -770,6 +698,8 @@
`disablepop3` enum('n','y') NOT NULL default 'n',
`disabledeliver` enum('n','y') NOT NULL default 'n',
`disablesmtp` enum('n','y') NOT NULL default 'n',
+ `disablesieve` enum('n','y') NOT NULL default 'n',
+ `disablelda` enum('n','y') NOT NULL default 'n',
PRIMARY KEY (`mailuser_id`),
KEY `server_id` (`server_id`,`email`),
KEY `email_access` (`email`,`access`)
@@ -990,26 +920,6 @@
-- --------------------------------------------------------
---
--- Table structure for table `proxy_reverse`
---
-
-CREATE TABLE `proxy_reverse` (
- `rewrite_id` int(11) 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',
- `rewrite_url_src` varchar(100) NOT NULL,
- `rewrite_url_dst` varchar(100) NOT NULL,
- `active` enum('n','y') NOT NULL DEFAULT 'y',
- PRIMARY KEY (`rewrite_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
-
--- --------------------------------------------------------
-
--
-- Table structure for table `remote_session`
--
@@ -1085,8 +995,11 @@
`sys_perm_group` varchar(5) default NULL,
`sys_perm_other` varchar(5) default NULL,
`server_id` int(11) unsigned NOT NULL default '0',
+ `client_id` int(11) unsigned NOT NULL default '0',
+ `ip_type` enum( 'IPv4', 'IPv6' ) NOT NULL DEFAULT 'IPv4',
`ip_address` varchar(39) default NULL,
`virtualhost` enum('n','y') NOT NULL default 'y',
+ `virtualhost_port` varchar(255) default '80,443',
PRIMARY KEY (`server_ip_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -1114,7 +1027,7 @@
`shell` varchar(255) NOT NULL default '/bin/bash',
`dir` varchar(255) default NULL,
`chroot` varchar(255) NOT NULL,
- `ssh_rsa` VARCHAR( 600 ) NOT NULL default '',
+ `ssh_rsa` text NOT NULL,
PRIMARY KEY (`shell_user_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -1463,7 +1376,7 @@
--
CREATE TABLE `sys_session` (
- `session_id` varchar(32) NOT NULL DEFAULT '',
+ `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',
`session_data` longtext,
@@ -1562,6 +1475,7 @@
`sys_perm_other` varchar(5) default NULL,
`server_id` int(11) unsigned NOT NULL default '0',
`ip_address` varchar(39) default NULL,
+ `ipv6_address` VARCHAR( 255 ) default NULL,
`domain` varchar(255) default NULL,
`type` varchar(32) default NULL,
`parent_domain_id` int(11) unsigned NOT NULL default '0',
@@ -1579,8 +1493,10 @@
`subdomain` enum('none','www','*') NOT NULL default 'none',
`php` varchar(32) NOT NULL default 'y',
`ruby` enum('n','y') NOT NULL default 'n',
+ `python` enum('n','y') NOT NULL default 'n',
`redirect_type` varchar(255) default NULL,
`redirect_path` varchar(255) default NULL,
+ `seo_redirect` varchar(255) default NULL,
`ssl` enum('n','y') NOT NULL default 'n',
`ssl_state` varchar(255) NULL,
`ssl_locality` varchar(255) NULL,
@@ -1597,6 +1513,11 @@
`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',
+ `pm_max_children` int(11) NOT NULL DEFAULT '50',
+ `pm_start_servers` int(11) NOT NULL DEFAULT '20',
+ `pm_min_spare_servers` int(11) NOT NULL DEFAULT '5',
+ `pm_max_spare_servers` int(11) NOT NULL DEFAULT '35',
`php_open_basedir` mediumtext,
`custom_php_ini` mediumtext,
`backup_interval` VARCHAR( 255 ) NOT NULL DEFAULT 'none',
@@ -1605,6 +1526,56 @@
`traffic_quota_lock` enum('n','y') NOT NULL default 'n',
PRIMARY KEY (`domain_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `web_folder`
+--
+
+CREATE TABLE IF NOT EXISTS `web_folder` (
+ `web_folder_id` bigint(20) NOT NULL AUTO_INCREMENT,
+ `sys_userid` int(11) NOT NULL DEFAULT '0',
+ `sys_groupid` int(11) 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) NOT NULL DEFAULT '0',
+ `parent_domain_id` int(11) NOT NULL DEFAULT '0',
+ `path` varchar(255) DEFAULT NULL,
+ `active` varchar(255) NOT NULL DEFAULT 'y',
+ PRIMARY KEY (`web_folder_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+
+--
+-- Dumping data for table `web_folder`
+--
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `web_folder_user`
+--
+
+CREATE TABLE IF NOT EXISTS `web_folder_user` (
+ `web_folder_user_id` bigint(20) NOT NULL AUTO_INCREMENT,
+ `sys_userid` int(11) NOT NULL DEFAULT '0',
+ `sys_groupid` int(11) 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) NOT NULL DEFAULT '0',
+ `web_folder_id` int(11) NOT NULL DEFAULT '0',
+ `username` varchar(255) DEFAULT NULL,
+ `password` varchar(255) DEFAULT NULL,
+ `active` varchar(255) NOT NULL DEFAULT 'y',
+ PRIMARY KEY (`web_folder_user_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+
+--
+-- Dumping data for table `web_folder_user`
+--
-- --------------------------------------------------------
@@ -1948,6 +1919,6 @@
-- Dumping data for table `sys_config`
--
-INSERT INTO sys_config VALUES ('1','db','db_version','3.0.3.3');
+INSERT INTO sys_config VALUES ('1','db','db_version','3.0.4');
SET FOREIGN_KEY_CHECKS = 1;
\ No newline at end of file
--
Gitblit v1.9.1