From cdda6b98d785f103d9be6643a99a882c0d65b64c Mon Sep 17 00:00:00 2001
From: fantu <fantu@ispconfig3>
Date: Sun, 21 Dec 2008 04:51:07 -0500
Subject: [PATCH] fix parse error
---
install/sql/ispconfig3.sql | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 112 insertions(+), 3 deletions(-)
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 01ef1ec..2da7734 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -1,4 +1,32 @@
+/*
+Copyright (c) 2007, Till Brehm, projektfarm Gmbh
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ * Neither the name of ISPConfig nor the names of its contributors
+ may be used to endorse or promote products derived from this software without
+ specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
-- ISPConfig 3
-- DB-Version: 3.0.0.8
@@ -68,12 +96,52 @@
`password` varchar(255) default NULL,
`language` varchar(255) NOT NULL default 'en',
`usertheme` varchar(255) NOT NULL default 'default',
+ `template_master` bigint(20) NOT NULL default '0',
+ `template_additional` varchar(255) NOT NULL default '',
PRIMARY KEY (`client_id`)
) ENGINE=MyISAM AUTO_INCREMENT=1 ;
--
-- Daten f�r Tabelle `client`
--
+
+--
+-- Tabellenstruktur f�r Tabelle `client_template`
+--
+
+CREATE TABLE `client_template` (
+ `template_id` bigint(20) NOT NULL auto_increment,
+ `template_name` varchar(50) NOT NULL,
+ `template_type` varchar(1) NOT NULL default 'm',
+ `limit_maildomain` int(11) NOT NULL default '-1',
+ `limit_mailbox` int(11) NOT NULL default '-1',
+ `limit_mailalias` int(11) NOT NULL default '-1',
+ `limit_mailforward` int(11) NOT NULL default '-1',
+ `limit_mailcatchall` int(11) NOT NULL default '-1',
+ `limit_mailrouting` int(11) NOT NULL default '0',
+ `limit_mailfilter` int(11) NOT NULL default '-1',
+ `limit_fetchmail` int(11) NOT NULL default '-1',
+ `limit_mailquota` int(11) NOT NULL default '-1',
+ `limit_spamfilter_wblist` int(11) NOT NULL default '0',
+ `limit_spamfilter_user` int(11) NOT NULL default '0',
+ `limit_spamfilter_policy` int(11) NOT NULL default '0',
+ `limit_web_ip` text,
+ `limit_web_domain` int(11) NOT NULL default '-1',
+ `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',
+ `limit_dns_zone` int(11) NOT NULL default '-1',
+ `limit_dns_record` int(11) NOT NULL default '-1',
+ `limit_database` int(11) NOT NULL default '-1',
+ `limit_client` int(11) NOT NULL default '0',
+ `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,
+ PRIMARY KEY (`template_id`)
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
-- --------------------------------------------------------
@@ -570,7 +638,7 @@
`db_server` tinyint(4) NOT NULL default '0',
`vserver_server` tinyint(4) NOT NULL default '0',
`config` text NOT NULL,
- `updated` tinyint(4) NOT NULL default '0',
+ `updated` bigint(20) unsigned NOT NULL default '0',
`active` tinyint(4) NOT NULL default '1',
PRIMARY KEY (`server_id`)
) ENGINE=MyISAM AUTO_INCREMENT=1 ;
@@ -883,7 +951,9 @@
`tstamp` bigint(20) NOT NULL default '0',
`user` varchar(255) NOT NULL default '',
`data` text NOT NULL,
- PRIMARY KEY (`datalog_id`)
+ `status` set('pending','ok','warning','error') NOT NULL default 'pending',
+ PRIMARY KEY (`datalog_id`),
+ KEY `server_id` (`server_id`,`status`)
) ENGINE=MyISAM AUTO_INCREMENT=1 ;
--
@@ -968,6 +1038,44 @@
-- --------------------------------------------------------
--
+-- Tabellenstruktur f�r Tabelle `sys_ini`
+--
+
+CREATE TABLE `sys_ini` (
+ `sysini_id` int(11) NOT NULL auto_increment,
+ `config` longtext NOT NULL,
+ PRIMARY KEY (`sysini_id`)
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
+
+--
+-- Daten f�r Tabelle `sys_ini`
+--
+
+INSERT INTO `sys_ini` (`sysini_id`, `config`) VALUES (1, '');
+
+-- --------------------------------------------------------
+
+--
+-- Tabellenstruktur f�r Tabelle `sys_log`
+--
+
+CREATE TABLE `sys_log` (
+ `syslog_id` int(10) unsigned NOT NULL auto_increment,
+ `server_id` int(10) unsigned NOT NULL default '0',
+ `datalog_id` bigint(20) unsigned NOT NULL default '0',
+ `loglevel` tinyint(4) NOT NULL default '0',
+ `tstamp` int(10) unsigned NOT NULL,
+ `message` text,
+ PRIMARY KEY (`syslog_id`)
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
+
+--
+-- Daten f�r Tabelle `sys_log`
+--
+
+-- --------------------------------------------------------
+
+--
-- Tabellenstruktur f�r Tabelle `sys_user`
--
@@ -1027,6 +1135,7 @@
`suexec` char(1) NOT NULL default 'y',
`errordocs` tinyint(1) NOT NULL default '1',
`is_subdomainwww` tinyint(1) NOT NULL default '1',
+ `subdomain` enum('none','www','*') NOT NULL default 'www',
`php` varchar(255) NOT NULL default 'y',
`redirect_type` varchar(255) default NULL,
`redirect_path` varchar(255) default NULL,
@@ -1116,7 +1225,7 @@
`value` varchar(255) NOT NULL
) ENGINE=MyISAM;
-INSERT INTO sys_config VALUES ('1','db','db_version','3.0.0.8');
+INSERT INTO sys_config VALUES ('1','db','db_version','3.0.0.8 beta');
-- --------------------------------------------------------
--
Gitblit v1.9.1