From dd1afa99b17596d4150d4b9b2741189f42d655d1 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 30 Nov 2010 05:09:10 -0500
Subject: [PATCH] Fixed syntax error in apache plugin.
---
install/sql/ispconfig3.sql | 102 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 95 insertions(+), 7 deletions(-)
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index f09766d..b3baa26 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -1,6 +1,6 @@
/*
-Copyright (c) 2007-2009, Till Brehm, projektfarm Gmbh
+Copyright (c) 2007-2010, Till Brehm, projektfarm Gmbh
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
@@ -53,6 +53,8 @@
`sys_perm_other` varchar(5) default NULL,
`company_name` varchar(64) default NULL,
`contact_name` varchar(64) default NULL,
+ `customer_no` varchar(64) default NULL,
+ `vat_id` varchar(64) default NULL,
`street` varchar(255) default NULL,
`zip` varchar(32) default NULL,
`city` varchar(64) default NULL,
@@ -92,6 +94,7 @@
`limit_webdav_user` 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',
`limit_dns_record` int(11) NOT NULL default '-1',
`default_dbserver` int(11) NOT NULL default '1',
`limit_database` int(11) NOT NULL default '-1',
@@ -148,6 +151,7 @@
`limit_shell_user` int(11) NOT NULL default '0',
`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',
`limit_dns_record` int(11) NOT NULL default '-1',
`limit_database` int(11) NOT NULL default '-1',
`limit_cron` int(11) NOT NULL default '0',
@@ -162,7 +166,7 @@
-- --------------------------------------------------------
--
--- Table structure for table `dns_rr`
+-- Table structure for table `cron`
--
CREATE TABLE `cron` (
`id` int(11) unsigned NOT NULL auto_increment,
@@ -239,6 +243,29 @@
`xfer` varchar(255) NOT NULL,
`also_notify` varchar(255) default NULL,
`update_acl` varchar(255) default NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `origin` (`origin`),
+ KEY `active` (`active`)
+) ENGINE=MyISAM AUTO_INCREMENT=1;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `dns_slave`
+--
+
+CREATE TABLE `dns_slave` (
+ `id` int(10) unsigned NOT NULL auto_increment,
+ `sys_userid` int(11) unsigned NOT NULL,
+ `sys_groupid` int(11) unsigned NOT NULL,
+ `sys_perm_user` varchar(5) NOT NULL,
+ `sys_perm_group` varchar(5) NOT NULL,
+ `sys_perm_other` varchar(5) NOT NULL,
+ `server_id` int(11) NOT NULL default '1',
+ `origin` varchar(255) NOT NULL,
+ `ns` varchar(255) NOT NULL,
+ `active` enum('N','Y') NOT NULL,
+ `xfer` varchar(255) NOT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `origin` (`origin`),
KEY `active` (`active`)
@@ -414,7 +441,7 @@
`sys_perm_other` varchar(5) NOT NULL default '',
`server_id` int(11) unsigned NOT NULL default '0',
`source` varchar(255) NOT NULL,
- `destination` text NOT NULL default '',
+ `destination` text,
`type` enum('alias','aliasdomain','forward','catchall') NOT NULL default 'alias',
`active` enum('n','y') NOT NULL,
PRIMARY KEY (`forwarding_id`),
@@ -560,6 +587,7 @@
`gid` int(11) unsigned NOT NULL default '5000',
`maildir` varchar(255) NOT NULL default '',
`quota` bigint(20) NOT NULL default '-1',
+ `cc` varchar(255) NOT NULL default '',
`homedir` varchar(255) NOT NULL,
`autoresponder` enum('n','y') NOT NULL default 'n',
`autoresponder_start_date` datetime NOT NULL default '0000-00-00 00:00:00',
@@ -658,6 +686,7 @@
`config` text NOT NULL,
`updated` bigint(20) unsigned NOT NULL default '0',
`mirror_server_id` int(11) unsigned NOT NULL default '0',
+ `dbversion` int(11) unsigned NOT NULL default '1',
`active` tinyint(1) NOT NULL default '1',
PRIMARY KEY (`server_id`)
) ENGINE=MyISAM AUTO_INCREMENT=1;
@@ -718,6 +747,11 @@
`package_description` text,
`package_version` varchar(8) default NULL,
`package_type` enum('ispconfig','app','web') NOT NULL default 'app',
+ `package_installable` enum('yes','no','key') NOT NULL default 'yes',
+ `package_requires_db` enum('no','mysql') NOT NULL default 'no',
+ `package_remote_functions` text,
+ `package_key` varchar(255) NOT NULL,
+ `package_config` text,
PRIMARY KEY (`package_id`),
UNIQUE KEY `package_name` (`package_name`)
) ENGINE=MyISAM AUTO_INCREMENT=1;
@@ -1036,6 +1070,21 @@
-- --------------------------------------------------------
--
+-- Table structure for table `sys_session`
+--
+
+CREATE TABLE `sys_session` (
+ `session_id` varchar(32) 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,
+ PRIMARY KEY (`session_id`),
+ KEY `last_updated` (`last_updated`)
+) ENGINE=MyISAM;
+
+-- --------------------------------------------------------
+
+--
-- Table structure for table `web_domain`
--
@@ -1064,6 +1113,7 @@
`is_subdomainwww` tinyint(1) NOT NULL default '1',
`subdomain` enum('none','www','*') NOT NULL default 'none',
`php` varchar(32) NOT NULL default 'y',
+ `ruby` enum('n','y') NOT NULL default 'n',
`redirect_type` varchar(255) default NULL,
`redirect_path` varchar(255) default NULL,
`ssl` enum('n','y') NOT NULL default 'n',
@@ -1078,9 +1128,13 @@
`ssl_bundle` mediumtext NULL,
`ssl_action` varchar(16) NULL,
`stats_password` varchar(255) default NULL,
+ `stats_type` varchar(255) default 'webalizer',
`allow_override` varchar(255) NOT NULL default 'All',
- `apache_directives` text,
- `php_open_basedir` text,
+ `apache_directives` mediumtext,
+ `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',
PRIMARY KEY (`domain_id`)
@@ -1291,7 +1345,7 @@
-- Dumping data for table `sys_user`
--
-INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `username`, `passwort`, `modules`, `startmodule`, `app_theme`, `typ`, `active`, `language`, `groups`, `default_group`, `client_id`) VALUES (1, 1, 0, 'riud', 'riud', '', 'admin', '21232f297a57a5a743894a0e4a801fc3', 'admin,client,mail,monitor,sites,dns,tools,help', 'mail', 'default', 'admin', 1, 'en', '1,2', 1, 0);
+INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `username`, `passwort`, `modules`, `startmodule`, `app_theme`, `typ`, `active`, `language`, `groups`, `default_group`, `client_id`) VALUES (1, 1, 0, 'riud', 'riud', '', 'admin', '21232f297a57a5a743894a0e4a801fc3', 'dashboard,admin,client,mail,monitor,sites,dns,tools,help', 'dashboard', 'default', 'admin', 1, 'en', '1,2', 1, 0);
-- --------------------------------------------------------
@@ -1299,7 +1353,7 @@
-- Dumping data for table `sys_config`
--
-INSERT INTO sys_config VALUES ('1','db','db_version','3.0.2.1');
+INSERT INTO sys_config VALUES ('1','db','db_version','3.0.3.1');
-- --------------------------------------------------------
@@ -1562,6 +1616,40 @@
('ZW', 'ZIMBABWE', 'Zimbabwe', 'ZWE', 716);
-- --------------------------------------------------------
+-- tables for the FAQ module
+
+CREATE TABLE `help_faq_sections` (
+ `hfs_id` int(11) NOT NULL AUTO_INCREMENT,
+ `hfs_name` varchar(255) DEFAULT NULL,
+ `hfs_order` int(11) DEFAULT '0',
+ `sys_userid` int(11) DEFAULT NULL,
+ `sys_groupid` int(11) DEFAULT NULL,
+ `sys_perm_user` varchar(5) DEFAULT NULL,
+ `sys_perm_group` varchar(5) DEFAULT NULL,
+ `sys_perm_other` varchar(5) DEFAULT NULL,
+ PRIMARY KEY (`hfs_id`)
+) ENGINE=MyISAM AUTO_INCREMENT=1;
+
+INSERT INTO `help_faq_sections` VALUES (1,'General',0,NULL,NULL,NULL,NULL,NULL);
+
+CREATE TABLE `help_faq` (
+ `hf_id` int(11) NOT NULL AUTO_INCREMENT,
+ `hf_section` int(11) DEFAULT NULL,
+ `hf_order` int(11) DEFAULT '0',
+ `hf_question` text,
+ `hf_answer` text,
+ `sys_userid` int(11) DEFAULT NULL,
+ `sys_groupid` int(11) DEFAULT NULL,
+ `sys_perm_user` varchar(5) DEFAULT NULL,
+ `sys_perm_group` varchar(5) DEFAULT NULL,
+ `sys_perm_other` varchar(5) DEFAULT NULL,
+ PRIMARY KEY (`hf_id`)
+) ENGINE=MyISAM AUTO_INCREMENT=1;
+
+INSERT INTO `help_faq` VALUES (1,1,0,'I\'d like to know ...','Yes, of course.',1,1,'riud','riud','r');
+
+ALTER TABLE client ADD COLUMN company_id varchar(30);
+
-- --------------------------------------------------------
SET FOREIGN_KEY_CHECKS = 1;
--
Gitblit v1.9.1