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 |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 378af4a..fd62648 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -688,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,
@@ -1026,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 ;
 
@@ -1513,6 +1514,10 @@
   `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',
@@ -1914,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