From cd14965287d4478b6f63d052bdfc756f01d23ccf Mon Sep 17 00:00:00 2001
From: latham <latham@ispconfig3>
Date: Fri, 27 May 2011 16:18:51 -0400
Subject: [PATCH] remove local settings file. New config system that Till noted in the Coding Notes is replacing this.
---
install/sql/ispconfig3.sql | 80 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 76 insertions(+), 4 deletions(-)
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 3221aa3..07d0510 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -112,6 +112,8 @@
`template_master` int(11) unsigned NOT NULL default '0',
`template_additional` varchar(255) NOT NULL default '',
`created_at` bigint(20) DEFAULT NULL,
+ `id_rsa` VARCHAR( 2000 ) NOT NULL default '',
+ `ssh_rsa` VARCHAR( 600 ) NOT NULL default '',
PRIMARY KEY (`client_id`)
) ENGINE=MyISAM AUTO_INCREMENT=1;
@@ -587,6 +589,7 @@
`sys_perm_other` varchar(5) NOT NULL default '',
`server_id` int(11) unsigned NOT NULL default '0',
`email` varchar(255) NOT NULL default '',
+ `login` varchar(255) NOT NULL,
`password` varchar(255) NOT NULL,
`name` varchar(255) NOT NULL default '',
`uid` int(11) unsigned NOT NULL default '5000',
@@ -689,6 +692,8 @@
`file_server` tinyint(1) NOT NULL default '0',
`db_server` tinyint(1) NOT NULL default '0',
`vserver_server` tinyint(1) NOT NULL default '0',
+ `proxy_server` tinyint(1) NOT NULL default '0',
+ `firewall_server` tinyint(1) NOT NULL default '0',
`config` text NOT NULL,
`updated` bigint(20) unsigned NOT NULL default '0',
`mirror_server_id` int(11) unsigned NOT NULL default '0',
@@ -1067,12 +1072,12 @@
`app_theme` varchar(32) NOT NULL default 'default',
`typ` varchar(16) NOT NULL default 'user',
`active` tinyint(1) NOT NULL default '1',
- `language` varchar(2) NOT NULL default 'de',
- `groups` varchar(255) NOT NULL default '',
+ `language` varchar(2) NOT NULL default 'en',
+ `groups` TEXT NOT NULL default '',
`default_group` int(11) unsigned NOT NULL default '0',
`client_id` int(11) unsigned NOT NULL default '0',
`id_rsa` VARCHAR( 2000 ) NOT NULL default '',
- `ssh_rsa` VARCHAR( 600 ) NOT NULL default '',
+ `ssh_rsa` VARCHAR( 600 ) NOT NULL default '',
PRIMARY KEY (`userid`)
) ENGINE=MyISAM AUTO_INCREMENT=1;
@@ -1140,6 +1145,7 @@
`stats_type` varchar(255) default 'webalizer',
`allow_override` varchar(255) NOT NULL default 'All',
`apache_directives` mediumtext,
+ `nginx_directives` mediumtext,
`php_open_basedir` mediumtext,
`custom_php_ini` mediumtext,
`backup_interval` VARCHAR( 255 ) NOT NULL DEFAULT 'none',
@@ -1148,6 +1154,8 @@
`traffic_quota_lock` enum('n','y') NOT NULL default 'n',
PRIMARY KEY (`domain_id`)
) ENGINE=MyISAM AUTO_INCREMENT=1;
+
+
-- --------------------------------------------------------
@@ -1308,7 +1316,7 @@
-- Dumping data for table `dns_template`
--
-INSERT INTO `dns_template` (`template_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `name`, `fields`, `template`, `visible`) VALUES (1, 1, 1, 'riud', 'riud', '', 'Default', 'DOMAIN,IP,NS1,NS2,EMAIL', '[ZONE]\norigin={DOMAIN}.\nns={NS1}.\nmbox={EMAIL}.\nrefresh=28800\nretry=7200\nexpire=604800\nminimum=86400\nttl=86400\n\n[DNS_RECORDS]\nA|{DOMAIN}.|{IP}|0|86400\nA|www|{IP}|0|86400\nA|mail|{IP}|0|86400\nNS|{DOMAIN}.|{NS1}.|0|86400\nNS|{DOMAIN}.|{NS2}.|0|86400\nMX|{DOMAIN}.|mail.{DOMAIN}.|10|86400', 'y');
+INSERT INTO `dns_template` (`template_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `name`, `fields`, `template`, `visible`) VALUES (1, 1, 1, 'riud', 'riud', '', 'Default', 'DOMAIN,IP,NS1,NS2,EMAIL', '[ZONE]\norigin={DOMAIN}.\nns={NS1}.\nmbox={EMAIL}.\nrefresh=7200\nretry=540\nexpire=604800\nminimum=86400\nttl=3600\n\n[DNS_RECORDS]\nA|{DOMAIN}.|{IP}|0|3600\nA|www|{IP}|0|3600\nA|mail|{IP}|0|3600\nNS|{DOMAIN}.|{NS1}.|0|3600\nNS|{DOMAIN}.|{NS2}.|0|3600\nMX|{DOMAIN}.|mail.{DOMAIN}.|10|3600', 'y');
-- --------------------------------------------------------
@@ -1659,6 +1667,70 @@
ALTER TABLE client ADD COLUMN company_id varchar(30);
+
+CREATE TABLE `proxy_reverse` (
+ `rewrite_id` int(11) 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',
+ `rewrite_url_src` varchar(100) NOT NULL,
+ `rewrite_url_dst` varchar(100) NOT NULL,
+ `active` enum('n','y') NOT NULL default 'y',
+ PRIMARY KEY (`rewrite_id`)
+) ENGINE=MyISAM AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+
+
+CREATE TABLE `firewall_filter` (
+ `firewall_id` int(11) unsigned NOT NULL auto_increment,
+ `sys_userid` int(11) unsigned NOT NULL default '0',
+ `domain_id` int(11) NOT NULL,
+ `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',
+ `rule_name` varchar(100) default NULL,
+ `rule_id` int(11) default 1,
+ `src_ip` varchar(20) NOT NULL,
+ `src_netmask` varchar(20) NOT NULL,
+ `dst_ip` varchar(20) NOT NULL,
+ `dst_netmask` varchar(20) NOT NULL,
+ `src_from_port` varchar(10) NOT NULL,
+ `src_to_port` varchar(10) NOT NULL,
+ `dst_to_port` varchar(10) NOT NULL,
+ `dst_from_port` varchar(10) NOT NULL,
+ `protocol` varchar(10) default 'tcp',
+ `inbound_policy` enum('allow','deny','reject','limit') default 'allow',
+ `outbound_policy` enum('allow','deny','reject','limit') default 'allow',
+ `active` enum('n','y') NOT NULL default 'y',
+ `client_id` int(11) NOT NULL,
+ PRIMARY KEY (`firewall_id`)
+) ENGINE=MyISAM AUTO_INCREMENT=12 DEFAULT CHARSET=utf8;
+
+CREATE TABLE `firewall_forward` (
+ `firewall_id` int(11) unsigned NOT NULL auto_increment,
+ `sys_userid` int(11) unsigned NOT NULL default '0',
+ `domain_id` int(11) NOT NULL,
+ `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',
+ `application_name` varchar(100) default NULL,
+ `dst_ip` varchar(20) NOT NULL,
+ `src_from_port` varchar(10) NOT NULL,
+ `src_to_port` varchar(10) NOT NULL,
+ `dst_to_port` varchar(10) NOT NULL,
+ `dst_from_port` varchar(10) NOT NULL,
+ `protocol` int(3) default 0,
+ `active` enum('n','y') NOT NULL default 'y',
+ `client_id` int(11) NOT NULL,
+ PRIMARY KEY (`firewall_id`)
+) ENGINE=MyISAM AUTO_INCREMENT=12 DEFAULT CHARSET=utf8;
+
-- --------------------------------------------------------
SET FOREIGN_KEY_CHECKS = 1;
--
Gitblit v1.9.1