From f2ea1ac2223dd3c86abe2d41f96b58ea30f8fe61 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 27 Oct 2009 12:02:32 -0400
Subject: [PATCH] Added: FS#696 - Make the allow override settings configurable per server and website
---
install/sql/ispconfig3.sql | 69 ++++++++++++++++++++++++++++++++--
1 files changed, 64 insertions(+), 5 deletions(-)
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index e6f9dc8..c236f7c 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -69,6 +69,7 @@
`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_mailaliasdomain` 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',
@@ -92,6 +93,9 @@
`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',
+ `limit_cron` int(11) NOT NULL default '0',
+ `limit_cron_type` enum('url','chrooted','full') NOT NULL default 'url',
+ `limit_cron_frequency` int(11) NOT NULL default '5',
`limit_client` int(11) NOT NULL default '0',
`parent_client_id` int(11) unsigned NOT NULL default '0',
`username` varchar(64) default NULL,
@@ -100,7 +104,7 @@
`usertheme` varchar(32) NOT NULL default 'default',
`template_master` int(11) unsigned NOT NULL default '0',
`template_additional` varchar(255) NOT NULL default '',
- `created_at` datetime default NULL,
+ `created_at` bigint(20) DEFAULT NULL,
PRIMARY KEY (`client_id`)
) ENGINE=MyISAM AUTO_INCREMENT=1;
@@ -122,6 +126,7 @@
`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_mailaliasdomain` 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',
@@ -140,9 +145,39 @@
`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_cron` int(11) NOT NULL default '0',
+ `limit_cron_type` enum('url','chrooted','full') NOT NULL default 'url',
+ `limit_cron_frequency` int(11) NOT NULL default '5',
`limit_client` int(11) NOT NULL default '0',
PRIMARY KEY (`template_id`)
) ENGINE=MyISAM AUTO_INCREMENT=1;
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `dns_rr`
+--
+CREATE TABLE `cron` (
+ `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) NULL default NULL,
+ `sys_perm_group` varchar(5) NULL default NULL,
+ `sys_perm_other` varchar(5) NULL default NULL,
+ `server_id` int(11) unsigned NOT NULL default '0',
+ `parent_domain_id` int(11) unsigned NOT NULL default '0',
+ `type` enum('url','chrooted','full') NOT NULL default 'url',
+ `command` varchar(255) NOT NULL,
+ `run_min` varchar(100) NULL,
+ `run_hour` varchar(100) NULL,
+ `run_mday` varchar(100) NULL,
+ `run_month` varchar(100) NULL,
+ `run_wday` varchar(100) NULL,
+ `active` enum('n','y') NOT NULL default 'y',
+ PRIMARY KEY (`id`)
+) ENGINE=MyISAM AUTO_INCREMENT=1;
+
-- --------------------------------------------------------
@@ -196,6 +231,8 @@
`ttl` int(11) unsigned NOT NULL default '86400',
`active` enum('N','Y') NOT NULL,
`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`)
@@ -355,8 +392,8 @@
`sys_perm_other` varchar(5) NOT NULL default '',
`server_id` int(11) unsigned NOT NULL default '0',
`source` varchar(255) NOT NULL,
- `destination` varchar(255) NOT NULL default '',
- `type` enum('alias','forward','catchall') NOT NULL default 'alias',
+ `destination` text NOT NULL default '',
+ `type` enum('alias','aliasdomain','forward','catchall') NOT NULL default 'alias',
`active` enum('n','y') NOT NULL,
PRIMARY KEY (`forwarding_id`),
KEY `server_id` (`server_id`,`source`)
@@ -479,7 +516,7 @@
`uid` int(11) unsigned NOT NULL default '5000',
`gid` int(11) unsigned NOT NULL default '5000',
`maildir` varchar(255) NOT NULL default '',
- `quota` int(11) NOT NULL default '0',
+ `quota` int(11) NOT NULL default '-1',
`homedir` varchar(255) NOT NULL,
`autoresponder` enum('n','y') NOT NULL default 'n',
`autoresponder_text` mediumtext NULL,
@@ -539,6 +576,11 @@
CREATE TABLE `remote_user` (
`remote_userid` 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,
`remote_username` varchar(64) NOT NULL,
`remote_password` varchar(64) NOT NULL,
`remote_functions` text NOT NULL,
@@ -980,11 +1022,13 @@
`ssl_organisation` varchar(255) NULL,
`ssl_organisation_unit` varchar(255) NULL,
`ssl_country` varchar(255) NULL,
+ `ssl_domain` varchar(255) NULL,
`ssl_request` mediumtext NULL,
`ssl_cert` mediumtext NULL,
`ssl_bundle` mediumtext NULL,
`ssl_action` varchar(16) NULL,
`stats_password` varchar(255) default NULL,
+ `allow_override` varchar(32) NOT NULL default 'All',
`apache_directives` text,
`active` enum('n','y') NOT NULL default 'y',
PRIMARY KEY (`domain_id`)
@@ -1010,9 +1054,24 @@
`database_password` varchar(64) default NULL,
`database_charset` varchar(64) default NULL,
`remote_access` enum('n','y') NOT NULL default 'y',
+ `remote_ips` text NOT NULL,
`active` enum('n','y') NOT NULL default 'y',
PRIMARY KEY (`database_id`)
) ENGINE=MyISAM AUTO_INCREMENT=1;
+
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `web_traffic`
+--
+
+CREATE TABLE `web_traffic` (
+ `hostname` varchar(255) NOT NULL,
+ `traffic_date` date NOT NULL,
+ `traffic_bytes` bigint(32) unsigned NOT NULL default '0',
+ PRIMARY KEY (`hostname`,`traffic_date`)
+) ENGINE=MyISAM;
-- --------------------------------------------------------
@@ -1148,7 +1207,7 @@
-- Dumping data for table `sys_config`
--
-INSERT INTO sys_config VALUES ('1','db','db_version','3.0.1.3');
+INSERT INTO sys_config VALUES ('1','db','db_version','3.0.1.5');
-- --------------------------------------------------------
--
Gitblit v1.9.1