From dae3b41faee2777046b0b612e2bd8b28caf0f189 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 19 Jul 2012 04:07:53 -0400
Subject: [PATCH] Fixed a warning in cron log on non web servers.
---
install/sql/ispconfig3.sql | 166 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 160 insertions(+), 6 deletions(-)
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index e8162b8..f4e3f28 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2007-2011, Till Brehm, projektfarm Gmbh
+Copyright (c) 2007-2012, Till Brehm, projektfarm Gmbh
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
@@ -54,6 +54,68 @@
-- --------------------------------------------------------
--
+-- Table structure for table `aps_instances`
+--
+
+CREATE TABLE IF NOT EXISTS `aps_instances` (
+ `id` int(4) NOT NULL AUTO_INCREMENT,
+ `server_id` int(11) NOT NULL DEFAULT '0',
+ `customer_id` int(4) NOT NULL,
+ `package_id` int(4) NOT NULL,
+ `instance_status` int(4) NOT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `aps_instances_settings`
+--
+
+CREATE TABLE IF NOT EXISTS `aps_instances_settings` (
+ `id` int(4) NOT NULL AUTO_INCREMENT,
+ `server_id` int(11) NOT NULL DEFAULT '0',
+ `instance_id` int(4) NOT NULL,
+ `name` varchar(255) NOT NULL,
+ `value` text NOT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `aps_packages`
+--
+
+CREATE TABLE IF NOT EXISTS `aps_packages` (
+ `id` int(4) NOT NULL AUTO_INCREMENT,
+ `path` varchar(255) NOT NULL,
+ `name` varchar(255) NOT NULL,
+ `category` varchar(255) NOT NULL,
+ `version` varchar(20) NOT NULL,
+ `release` int(4) NOT NULL,
+ `package_url` TEXT NOT NULL,
+ `package_status` int(1) NOT NULL DEFAULT '2',
+ PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
+
+-- --------------------------------------------------------
+
+--
+-- Tabellenstruktur für Tabelle `aps_settings`
+--
+
+CREATE TABLE IF NOT EXISTS `aps_settings` (
+ `id` int(4) NOT NULL AUTO_INCREMENT,
+ `name` varchar(255) NOT NULL,
+ `value` text NOT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `name` (`name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
+
+-- --------------------------------------------------------
+
+--
-- Table structure for table `attempts_login`
--
@@ -93,6 +155,11 @@
`internet` varchar(255) NOT NULL,
`icq` varchar(16) DEFAULT NULL,
`notes` text,
+ `bank_account_number` varchar(255) DEFAULT NULL,
+ `bank_code` varchar(255) DEFAULT NULL,
+ `bank_name` varchar(255) DEFAULT NULL,
+ `bank_account_iban` varchar(255) DEFAULT NULL,
+ `bank_account_swift` varchar(255) DEFAULT NULL,
`default_mailserver` int(11) unsigned NOT NULL DEFAULT '1',
`limit_maildomain` int(11) NOT NULL DEFAULT '-1',
`limit_mailbox` int(11) NOT NULL DEFAULT '-1',
@@ -118,6 +185,7 @@
`limit_shell_user` int(11) NOT NULL DEFAULT '0',
`ssh_chroot` varchar(255) NOT NULL DEFAULT 'no,jailkit,ssh-chroot',
`limit_webdav_user` int(11) NOT NULL DEFAULT '0',
+ `limit_aps` int(11) NOT NULL DEFAULT '0',
`default_dnsserver` int(11) unsigned NOT NULL DEFAULT '1',
`limit_dns_zone` int(11) NOT NULL DEFAULT '-1',
`limit_dns_slave_zone` int(11) NOT NULL DEFAULT '-1',
@@ -131,7 +199,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,
@@ -143,6 +211,26 @@
`id_rsa` varchar(2000) NOT NULL DEFAULT '',
`ssh_rsa` varchar(600) NOT NULL DEFAULT '',
PRIMARY KEY (`client_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `client_circle`
+--
+
+CREATE TABLE `client_circle` (
+ `circle_id` int(11) 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,
+ `circle_name` varchar(64) DEFAULT NULL,
+ `client_ids` text,
+ `description` text,
+ `active` enum('n','y') NOT NULL default 'y',
+ PRIMARY KEY (`circle_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
-- --------------------------------------------------------
@@ -183,6 +271,7 @@
`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_aps` 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',
`limit_dns_record` int(11) NOT NULL default '-1',
@@ -194,7 +283,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',
PRIMARY KEY (`template_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -688,6 +777,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,
@@ -1004,6 +1094,31 @@
-- --------------------------------------------------------
+
+--
+-- Table structure for table `server_php`
+--
+
+CREATE TABLE `server_php` (
+ `server_php_id` int(11) unsigned 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',
+ `client_id` int(11) unsigned NOT NULL DEFAULT '0',
+ `name` varchar(255) DEFAULT NULL,
+ `php_fastcgi_binary` varchar(255) DEFAULT NULL,
+ `php_fastcgi_ini_dir` varchar(255) DEFAULT NULL,
+ `php_fpm_init_script` varchar(255) DEFAULT NULL,
+ `php_fpm_ini_dir` varchar(255) DEFAULT NULL,
+ `php_fpm_pool_dir` varchar(255) DEFAULT NULL,
+ PRIMARY KEY (`server_php_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+
+-- --------------------------------------------------------
+
--
-- Table structure for table `shell_user`
--
@@ -1026,7 +1141,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 ;
@@ -1375,7 +1490,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,
@@ -1437,6 +1552,23 @@
-- --------------------------------------------------------
--
+-- Table structure for table `web_backup`
+--
+
+CREATE TABLE `web_backup` (
+ `backup_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `server_id` int(10) unsigned NOT NULL,
+ `parent_domain_id` int(10) unsigned NOT NULL,
+ `backup_type` enum('web','mysql') NOT NULL DEFAULT 'web',
+ `backup_mode` varchar(64) NOT NULL DEFAULT '',
+ `tstamp` int(10) unsigned NOT NULL,
+ `filename` varchar(255) NOT NULL,
+ PRIMARY KEY (`backup_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+
+-- --------------------------------------------------------
+
+--
-- Table structure for table `web_database`
--
@@ -1448,6 +1580,7 @@
`sys_perm_group` varchar(5) DEFAULT NULL,
`sys_perm_other` varchar(5) DEFAULT NULL,
`server_id` int(11) unsigned NOT NULL DEFAULT '0',
+ `parent_domain_id` int(11) unsigned NOT NULL DEFAULT '0',
`type` varchar(16) NOT NULL DEFAULT 'y',
`database_name` varchar(64) DEFAULT NULL,
`database_user` varchar(64) DEFAULT NULL,
@@ -1455,6 +1588,8 @@
`database_charset` varchar(64) DEFAULT NULL,
`remote_access` enum('n','y') NOT NULL DEFAULT 'y',
`remote_ips` text NOT NULL,
+ `backup_interval` VARCHAR( 255 ) NOT NULL DEFAULT 'none',
+ `backup_copies` INT NOT NULL DEFAULT '1',
`active` enum('n','y') NOT NULL DEFAULT 'y',
PRIMARY KEY (`database_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -1474,6 +1609,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',
@@ -1491,6 +1627,7 @@
`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,
@@ -1510,12 +1647,21 @@
`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` enum('static','dynamic','ondemand') NOT NULL DEFAULT 'dynamic',
+ `pm_max_children` int(11) NOT NULL DEFAULT '10',
+ `pm_start_servers` int(11) NOT NULL DEFAULT '2',
+ `pm_min_spare_servers` int(11) NOT NULL DEFAULT '1',
+ `pm_max_spare_servers` int(11) NOT NULL DEFAULT '5',
+ `pm_process_idle_timeout` int(11) NOT NULL DEFAULT '10',
+ `pm_max_requests` int(11) NOT NULL DEFAULT '0',
`php_open_basedir` mediumtext,
`custom_php_ini` mediumtext,
`backup_interval` VARCHAR( 255 ) NOT NULL DEFAULT 'none',
`backup_copies` INT NOT NULL DEFAULT '1',
`active` enum('n','y') NOT NULL default 'y',
`traffic_quota_lock` enum('n','y') NOT NULL default 'n',
+ `fastcgi_php_version` varchar(255) DEFAULT NULL,
PRIMARY KEY (`domain_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -1587,6 +1733,14 @@
-- DB-DATA
-- --------------------------------------------------------
-- --------------------------------------------------------
+
+--
+-- Dumping data for table `aps_settings`
+--
+
+INSERT INTO `aps_settings` (`id`, `name`, `value`) VALUES(1, 'ignore-php-extension', '');
+INSERT INTO `aps_settings` (`id`, `name`, `value`) VALUES(2, 'ignore-php-configuration', '');
+INSERT INTO `aps_settings` (`id`, `name`, `value`) VALUES(3, 'ignore-webserver-module', '');
-- --------------------------------------------------------
@@ -1911,6 +2065,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.5');
SET FOREIGN_KEY_CHECKS = 1;
\ No newline at end of file
--
Gitblit v1.9.1