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 | 326 ++++++++++-------------------------------------------
1 files changed, 64 insertions(+), 262 deletions(-)
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 42b25f7..c236f7c 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -41,126 +41,6 @@
-- --------------------------------------------------------
--
--- Table structure for table `billing_invoice`
---
-
-CREATE TABLE `billing_invoice` (
- `billing_invoice_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,
- `sys_perm_all` varchar(5) default NULL,
- `invoice_number` varchar(32) NOT NULL default '',
- `invoice_date` date default NULL,
- `xml` longtext NOT NULL,
- `total_fee_net` decimal(10,4) NOT NULL default '0.00',
- `total_fee_gross` decimal(10,4) NOT NULL default '0.00',
- `currency_code` char(3) default 'EUR',
- PRIMARY KEY (`billing_invoice_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `billing_product`
---
-
-CREATE TABLE `billing_product` (
- `billing_product_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,
- `sys_perm_all` varchar(5) default NULL,
- `parent_id` int(11) unsigned NOT NULL default '0',
- `product_name` varchar(64) default NULL,
- `product_details` varchar(256) default NULL,
- `template_id` int(11) unsigned NOT NULL default '0',
- `service_class_id` int(11) unsigned NOT NULL default '0',
- `billing_tax_id` int(11) unsigned NOT NULL default '0',
- `setup_fee_gross` decimal(10,4) NOT NULL default '0.00',
- `interval_fee_gross` decimal(10,4) NOT NULL default '0.00',
- `interval_length` tinyint(3) NOT NULL default '0',
- `interval_type` enum('non-recurring','hour','day','week','month','quarter','year') NOT NULL default 'non-recurring',
- `interval_payment` enum('prepaid','postpaid') NOT NULL default 'prepaid',
- `clearing_period` tinyint(3) unsigned default '1',
- `currency_code` char(3) default 'EUR',
- PRIMARY KEY (`billing_product_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `billing_service`
---
-
-CREATE TABLE `billing_service` (
- `billing_service_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,
- `sys_perm_all` varchar(5) default NULL,
- `product_id` int(11) unsigned default NULL,
- `product_pid` int(11) unsigned default NULL,
- `product_name` varchar(64) default NULL,
- `product_details` varchar(256) default NULL,
- `service_class_id` int(11) unsigned default '0',
- `service_template_id` int(11) unsigned default NULL,
- `service_id` int(11) unsigned default NULL,
- `billing_tax_id` int(11) unsigned NOT NULL default '1',
- `quantity` smallint(5) unsigned NOT NULL default '1',
- `setup_fee_gross` decimal(10,4) NOT NULL default '0.00',
- `interval_fee_gross` decimal(10,4) default '0.00',
- `interval_fee_is_individual` tinyint(1) default '0',
- `interval_length` int(11) NOT NULL default '1',
- `interval_type` enum('non-recurring','hour','day','week','month','quarter','year') NOT NULL default 'non-recurring',
- `interval_payment` enum('prepaid','postpaid') NOT NULL default 'prepaid',
- `clearing_period` tinyint(3) unsigned default '1',
- `currency_code` char(3) default 'EUR',
- `is_active` tinyint(1) NOT NULL default '0',
- `service_start_at` date default NULL,
- `service_end_at` date default NULL,
- `invoiced_upto` date default NULL,
- PRIMARY KEY (`billing_service_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `billing_service_class`
---
-
-CREATE TABLE `billing_service_class` (
- `billing_service_class_id` int(11) unsigned NOT NULL auto_increment,
- `name` varchar(64) NOT NULL default '',
- `sort_order` int(11) unsigned NOT NULL default '0',
- PRIMARY KEY (`billing_service_class_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `billing_tax`
---
-
-CREATE TABLE `billing_tax` (
- `billing_tax_id` int(11) unsigned NOT NULL auto_increment,
- `name` varchar(64) NOT NULL default '',
- `tax_rate` decimal(10,4) default NULL,
- `is_default` tinyint(1) NOT NULL default '0',
- `valid_from` date default NULL,
- `valid_till` date default NULL,
- PRIMARY KEY (`billing_tax_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1;
-
--- --------------------------------------------------------
-
---
-- Table structure for table `client`
--
@@ -189,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',
@@ -212,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,
@@ -220,40 +104,8 @@
`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;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `client_address_book`
---
-
-CREATE TABLE `client_address_book` (
- `client_address_book_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,
- `entry_role` enum('Standard','Other','Administrator','Abuse','Accounting','Owner','Emergency','Technician','Signatory') default 'Standard',
- `entry_company` varchar(64) default NULL,
- `entry_gender` enum('m','f') default NULL,
- `entry_title` varchar(16) default NULL,
- `entry_firstname` varchar(32) NOT NULL,
- `entry_lastname` varchar(32) NOT NULL,
- `entry_address1` varchar(64) default NULL,
- `entry_address2` varchar(64) default NULL,
- `entry_postcode` varchar(32) NOT NULL,
- `entry_city` varchar(64) NOT NULL,
- `entry_state` varchar(32) default NULL,
- `entry_country` char(2) default NULL,
- `entry_phone` varchar(32) default NULL,
- `entry_fax` varchar(32) default NULL,
- `entry_mobile` varchar(32) default NULL,
- `entry_email` varchar(256) default NULL,
- PRIMARY KEY (`client_address_book_id`)
) ENGINE=MyISAM AUTO_INCREMENT=1;
-- --------------------------------------------------------
@@ -274,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',
@@ -292,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;
+
-- --------------------------------------------------------
@@ -348,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`)
@@ -371,94 +256,6 @@
`template` text,
`visible` enum('N','Y') NOT NULL default 'Y',
PRIMARY KEY (`template_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `domain`
---
-
-CREATE TABLE `domain` (
- `domain_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,
- `sys_perm_all` varchar(5) default NULL,
- `domain_provider_id` int(11) unsigned NOT NULL default '0',
- `provider_domain_id` int(11) unsigned default NULL,
- `domain` varchar(255) NOT NULL default '',
- `tld` varchar(32) NOT NULL default '',
- `handle_desc` varchar(32) default NULL,
- `handle_admin_c` varchar(32) default NULL,
- `handle_tech_c` varchar(32) default NULL,
- `handle_zone_c` varchar(32) default NULL,
- `added_at` timestamp NULL default NULL,
- `connected_at` date default NULL,
- `disconnected_at` date default NULL,
- `status` varchar(64) NOT NULL default '0',
- PRIMARY KEY (`domain_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `domain_handle`
---
-
-CREATE TABLE `domain_handle` (
- `domain_handle_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,
- `sys_perm_all` varchar(5) default NULL,
- `domain_registrar` varchar(64) default NULL,
- `handle` varchar(32) default NULL,
- PRIMARY KEY (`domain_handle_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `domain_provider`
---
-
-CREATE TABLE `domain_provider` (
- `domain_provider_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,
- `sys_perm_all` varchar(5) default NULL,
- `provider` varchar(255) default NULL,
- `is_extern` tinyint(1) NOT NULL default '0',
- `domainrobot_interface` varchar(16) default '',
- PRIMARY KEY (`domain_provider_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `domain_tld`
---
-
-CREATE TABLE `domain_tld` (
- `domain_tld_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,
- `sys_perm_all` varchar(5) default NULL,
- `tld` varchar(32) default NULL,
- `domain_provider_id` int(11) unsigned NOT NULL default '0',
- `domain_registrar` varchar(64) default NULL,
- PRIMARY KEY (`domain_tld_id`)
) ENGINE=MyISAM AUTO_INCREMENT=1;
-- --------------------------------------------------------
@@ -595,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`)
@@ -719,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,
@@ -779,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,
@@ -1220,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`)
@@ -1250,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;
-- --------------------------------------------------------
@@ -1331,23 +1150,6 @@
-- --------------------------------------------------------
--
--- Dumping data for table `billing_service_class`
---
-
-INSERT INTO `billing_service_class` VALUES (1,'other',9999);
-INSERT INTO `billing_service_class` VALUES (2,'hosting',10);
-INSERT INTO `billing_service_class` VALUES (3,'domains',20);
-INSERT INTO `billing_service_class` VALUES (4,'traffic',30);
-INSERT INTO `billing_service_class` VALUES (5,'diskspace',40);
-
---
--- Dumping data for table `billing_tax_class`
---
-
-INSERT INTO `billing_tax` VALUES (1,'USt. (DE)',19,1,'2007-01-01',NULL);
-INSERT INTO `billing_tax` VALUES (2,'USt. ermäßigt (DE)',7,0,'2007-01-01',NULL);
-
---
-- Dumping data for table `dns_template`
--
@@ -1405,7 +1207,7 @@
-- Dumping data for table `sys_config`
--
-INSERT INTO sys_config VALUES ('1','db','db_version','3.0.1');
+INSERT INTO sys_config VALUES ('1','db','db_version','3.0.1.5');
-- --------------------------------------------------------
--
Gitblit v1.9.1