Skip to content

Commit 6ad46ab

Browse files
tbrehmtbrehm
committed
Fixed: FS#1744 - Missing table by new setup
Removed unused database tables: DROP TABLE `mail_greylist`; DROP TABLE `firewall_filter`; DROP TABLE `firewall_forward`; DROP TABLE `proxy_reverse`; - Added tables for web folder protection.
1 parent 0ae8da5 commit 6ad46ab

File tree

3 files changed

+111
-601
lines changed

3 files changed

+111
-601
lines changed

‎install/sql/incremental/upd_0019.sql‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
CREATE TABLE `help_faq` (
2+
`hf_id` int(11) NOT NULL AUTO_INCREMENT,
3+
`hf_section` int(11) DEFAULT NULL,
4+
`hf_order` int(11) DEFAULT '0',
5+
`hf_question` text,
6+
`hf_answer` text,
7+
`sys_userid` int(11) DEFAULT NULL,
8+
`sys_groupid` int(11) DEFAULT NULL,
9+
`sys_perm_user` varchar(5) DEFAULT NULL,
10+
`sys_perm_group` varchar(5) DEFAULT NULL,
11+
`sys_perm_other` varchar(5) DEFAULT NULL,
12+
PRIMARY KEY (`hf_id`)
13+
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
14+
15+
CREATE TABLE `help_faq_sections` (
16+
`hfs_id` int(11) NOT NULL AUTO_INCREMENT,
17+
`hfs_name` varchar(255) DEFAULT NULL,
18+
`hfs_order` int(11) DEFAULT '0',
19+
`sys_userid` int(11) DEFAULT NULL,
20+
`sys_groupid` int(11) DEFAULT NULL,
21+
`sys_perm_user` varchar(5) DEFAULT NULL,
22+
`sys_perm_group` varchar(5) DEFAULT NULL,
23+
`sys_perm_other` varchar(5) DEFAULT NULL,
24+
PRIMARY KEY (`hfs_id`)
25+
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
26+
27+
CREATE TABLE IF NOT EXISTS `web_folder` (
28+
`web_folder_id` bigint(20) NOT NULL AUTO_INCREMENT,
29+
`sys_userid` int(11) NOT NULL DEFAULT '0',
30+
`sys_groupid` int(11) NOT NULL DEFAULT '0',
31+
`sys_perm_user` varchar(5) DEFAULT NULL,
32+
`sys_perm_group` varchar(5) DEFAULT NULL,
33+
`sys_perm_other` varchar(5) DEFAULT NULL,
34+
`server_id` int(11) NOT NULL DEFAULT '0',
35+
`parent_domain_id` int(11) NOT NULL DEFAULT '0',
36+
`path` varchar(255) DEFAULT NULL,
37+
`active` varchar(255) NOT NULL DEFAULT 'y',
38+
PRIMARY KEY (`web_folder_id`)
39+
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
40+
41+
CREATE TABLE IF NOT EXISTS `web_folder_user` (
42+
`web_folder_user_id` bigint(20) NOT NULL AUTO_INCREMENT,
43+
`sys_userid` int(11) NOT NULL DEFAULT '0',
44+
`sys_groupid` int(11) NOT NULL DEFAULT '0',
45+
`sys_perm_user` varchar(5) DEFAULT NULL,
46+
`sys_perm_group` varchar(5) DEFAULT NULL,
47+
`sys_perm_other` varchar(5) DEFAULT NULL,
48+
`web_folder_id` int(11) NOT NULL DEFAULT '0',
49+
`username` varchar(255) DEFAULT NULL,
50+
`password` varchar(255) DEFAULT NULL,
51+
`active` varchar(255) NOT NULL DEFAULT 'y',
52+
PRIMARY KEY (`web_folder_user_id`)
53+
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
54+
55+
DROP TABLE `mail_greylist`;
56+
DROP TABLE `firewall_filter`;
57+
DROP TABLE `firewall_forward`;
58+
DROP TABLE `proxy_reverse`;
59+
60+
61+
62+

‎install/sql/ispconfig3.sql‎

Lines changed: 49 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -374,66 +374,6 @@ CREATE TABLE `firewall` (
374374

375375
-- --------------------------------------------------------
376376

377-
--
378-
-- Table structure for table `firewall_filter`
379-
--
380-
381-
CREATE TABLE `firewall_filter` (
382-
`firewall_id` int(11) unsigned NOT NULL auto_increment,
383-
`sys_userid` int(11) unsigned NOT NULL default '0',
384-
`domain_id` int(11) NOT NULL,
385-
`sys_groupid` int(11) unsigned NOT NULL default '0',
386-
`sys_perm_user` varchar(5) default NULL,
387-
`sys_perm_group` varchar(5) default NULL,
388-
`sys_perm_other` varchar(5) default NULL,
389-
`server_id` int(11) unsigned NOT NULL default '0',
390-
`rule_name` varchar(100) default NULL,
391-
`rule_id` int(11) default 1,
392-
`src_ip` varchar(20) NOT NULL,
393-
`src_netmask` varchar(20) NOT NULL,
394-
`dst_ip` varchar(20) NOT NULL,
395-
`dst_netmask` varchar(20) NOT NULL,
396-
`src_from_port` varchar(10) NOT NULL,
397-
`src_to_port` varchar(10) NOT NULL,
398-
`dst_to_port` varchar(10) NOT NULL,
399-
`dst_from_port` varchar(10) NOT NULL,
400-
`protocol` varchar(10) default 'tcp',
401-
`inbound_policy` enum('allow','deny','reject','limit') default 'allow',
402-
`outbound_policy` enum('allow','deny','reject','limit') default 'allow',
403-
`active` enum('n','y') NOT NULL default 'y',
404-
`client_id` int(11) NOT NULL,
405-
PRIMARY KEY (`firewall_id`)
406-
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
407-
408-
-- --------------------------------------------------------
409-
410-
--
411-
-- Table structure for table `firewall_forward`
412-
--
413-
414-
CREATE TABLE `firewall_forward` (
415-
`firewall_id` int(11) unsigned NOT NULL auto_increment,
416-
`sys_userid` int(11) unsigned NOT NULL default '0',
417-
`domain_id` int(11) NOT NULL,
418-
`sys_groupid` int(11) unsigned NOT NULL default '0',
419-
`sys_perm_user` varchar(5) default NULL,
420-
`sys_perm_group` varchar(5) default NULL,
421-
`sys_perm_other` varchar(5) default NULL,
422-
`server_id` int(11) unsigned NOT NULL default '0',
423-
`application_name` varchar(100) default NULL,
424-
`dst_ip` varchar(20) NOT NULL,
425-
`src_from_port` varchar(10) NOT NULL,
426-
`src_to_port` varchar(10) NOT NULL,
427-
`dst_to_port` varchar(10) NOT NULL,
428-
`dst_from_port` varchar(10) NOT NULL,
429-
`protocol` int(3) default 0,
430-
`active` enum('n','y') NOT NULL default 'y',
431-
`client_id` int(11) NOT NULL,
432-
PRIMARY KEY (`firewall_id`)
433-
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
434-
435-
-- --------------------------------------------------------
436-
437377
--
438378
-- Table structure for table `ftp_user`
439379
--
@@ -640,23 +580,6 @@ CREATE TABLE `mail_get` (
640580

641581
-- --------------------------------------------------------
642582

643-
--
644-
-- Table structure for table `mail_greylist`
645-
--
646-
647-
CREATE TABLE `mail_greylist` (
648-
`greylist_id` int(11) unsigned NOT NULL auto_increment,
649-
`relay_ip` varchar(39) default NULL,
650-
`from_domain` varchar(255) default NULL,
651-
`block_expires` datetime NOT NULL default '0000-00-00 00:00:00',
652-
`record_expires` datetime NOT NULL default '0000-00-00 00:00:00',
653-
`origin_type` enum('MANUAL','AUTO') NOT NULL default 'AUTO',
654-
`create_time` datetime NOT NULL default '0000-00-00 00:00:00',
655-
PRIMARY KEY (`greylist_id`)
656-
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
657-
658-
-- --------------------------------------------------------
659-
660583
--
661584
-- Tabellenstruktur für Tabelle `mail_mailinglist`
662585
--
@@ -992,26 +915,6 @@ CREATE TABLE IF NOT EXISTS `openvz_vm` (
992915

993916
-- --------------------------------------------------------
994917

995-
--
996-
-- Table structure for table `proxy_reverse`
997-
--
998-
999-
CREATE TABLE `proxy_reverse` (
1000-
`rewrite_id` int(11) NOT NULL AUTO_INCREMENT,
1001-
`sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
1002-
`sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
1003-
`sys_perm_user` varchar(5) DEFAULT NULL,
1004-
`sys_perm_group` varchar(5) DEFAULT NULL,
1005-
`sys_perm_other` varchar(5) DEFAULT NULL,
1006-
`server_id` int(11) unsigned NOT NULL DEFAULT '0',
1007-
`rewrite_url_src` varchar(100) NOT NULL,
1008-
`rewrite_url_dst` varchar(100) NOT NULL,
1009-
`active` enum('n','y') NOT NULL DEFAULT 'y',
1010-
PRIMARY KEY (`rewrite_id`)
1011-
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
1012-
1013-
-- --------------------------------------------------------
1014-
1015918
--
1016919
-- Table structure for table `remote_session`
1017920
--
@@ -1613,6 +1516,55 @@ CREATE TABLE `web_domain` (
16131516

16141517
-- --------------------------------------------------------
16151518

1519+
--
1520+
-- Table structure for table `web_folder`
1521+
--
1522+
1523+
CREATE TABLE IF NOT EXISTS `web_folder` (
1524+
`web_folder_id` bigint(20) NOT NULL AUTO_INCREMENT,
1525+
`sys_userid` int(11) NOT NULL DEFAULT '0',
1526+
`sys_groupid` int(11) NOT NULL DEFAULT '0',
1527+
`sys_perm_user` varchar(5) DEFAULT NULL,
1528+
`sys_perm_group` varchar(5) DEFAULT NULL,
1529+
`sys_perm_other` varchar(5) DEFAULT NULL,
1530+
`server_id` int(11) NOT NULL DEFAULT '0',
1531+
`parent_domain_id` int(11) NOT NULL DEFAULT '0',
1532+
`path` varchar(255) DEFAULT NULL,
1533+
`active` varchar(255) NOT NULL DEFAULT 'y',
1534+
PRIMARY KEY (`web_folder_id`)
1535+
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
1536+
1537+
--
1538+
-- Dumping data for table `web_folder`
1539+
--
1540+
1541+
1542+
-- --------------------------------------------------------
1543+
1544+
--
1545+
-- Table structure for table `web_folder_user`
1546+
--
1547+
1548+
CREATE TABLE IF NOT EXISTS `web_folder_user` (
1549+
`web_folder_user_id` bigint(20) NOT NULL AUTO_INCREMENT,
1550+
`sys_userid` int(11) NOT NULL DEFAULT '0',
1551+
`sys_groupid` int(11) NOT NULL DEFAULT '0',
1552+
`sys_perm_user` varchar(5) DEFAULT NULL,
1553+
`sys_perm_group` varchar(5) DEFAULT NULL,
1554+
`sys_perm_other` varchar(5) DEFAULT NULL,
1555+
`web_folder_id` int(11) NOT NULL DEFAULT '0',
1556+
`username` varchar(255) DEFAULT NULL,
1557+
`password` varchar(255) DEFAULT NULL,
1558+
`active` varchar(255) NOT NULL DEFAULT 'y',
1559+
PRIMARY KEY (`web_folder_user_id`)
1560+
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
1561+
1562+
--
1563+
-- Dumping data for table `web_folder_user`
1564+
--
1565+
1566+
-- --------------------------------------------------------
1567+
16161568
--
16171569
-- Table structure for table `web_traffic`
16181570
--

0 commit comments

Comments
 (0)