From 2aaf93e5ad80a1b2f9605c1d14c6d702f23d355c Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 20 Apr 2011 05:02:26 -0400
Subject: [PATCH] Fixed: FS#1599 - Changing webdomain doesn't change PHP open_basedir
---
install/sql/ispconfig3.sql | 97 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 79 insertions(+), 18 deletions(-)
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 3394449..1eb1d57 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -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,
@@ -101,6 +103,7 @@
`limit_cron_frequency` int(11) NOT NULL default '5',
`limit_traffic_quota` int(11) NOT NULL default '-1',
`limit_client` int(11) NOT NULL default '0',
+ `limit_mailmailinglist` int(11) NOT NULL default '-1',
`parent_client_id` int(11) unsigned NOT NULL default '0',
`username` varchar(64) default NULL,
`password` varchar(64) default NULL,
@@ -109,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;
@@ -157,6 +162,7 @@
`limit_cron_frequency` int(11) NOT NULL default '5',
`limit_traffic_quota` int(11) NOT NULL default '-1',
`limit_client` int(11) NOT NULL default '0',
+ `limit_mailmailinglist` int(11) NOT NULL default '-1',
PRIMARY KEY (`template_id`)
) ENGINE=MyISAM AUTO_INCREMENT=1;
@@ -490,19 +496,23 @@
-- --------------------------------------------------------
---
--- Table structure for table `mail_mailman_domain`
---
+--
+-- Tabellenstruktur für Tabelle `mail_mailinglist`
+--
-CREATE TABLE `mail_mailman_domain` (
- `mailman_id` int(11) unsigned NOT NULL auto_increment,
+CREATE TABLE `mail_mailinglist` (
+ `mailinglist_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) NOT NULL,
+ `sys_perm_group` varchar(5) NOT NULL,
+ `sys_perm_other` varchar(5) NOT NULL,
`server_id` int(11) unsigned NOT NULL default '0',
- `domain` varchar(255) NOT NULL default '',
- `mm_home` varchar(255) NOT NULL default '',
- `mm_wrap` varchar(255) NOT NULL default '',
- `mm_user` varchar(50) NOT NULL default '',
- `mm_group` varchar(50) NOT NULL default '',
- PRIMARY KEY (`mailman_id`,`server_id`,`domain`)
+ `domain` varchar(255) NOT NULL,
+ `listname` varchar(255) NOT NULL,
+ `email` varchar(255) NOT NULL,
+ `password` varchar(255) NOT NULL,
+ PRIMARY KEY (`mailinglist_id`)
) ENGINE=MyISAM AUTO_INCREMENT=1;
-- --------------------------------------------------------
@@ -728,6 +738,7 @@
`shell` varchar(255) NOT NULL default '/bin/bash',
`dir` varchar(255) default NULL,
`chroot` varchar(255) NOT NULL,
+ `ssh_rsa` VARCHAR( 600 ) NOT NULL default '',
PRIMARY KEY (`shell_user_id`)
) ENGINE=MyISAM AUTO_INCREMENT=1;
@@ -747,6 +758,7 @@
`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`),
@@ -945,8 +957,8 @@
`action` char(1) NOT NULL default '',
`tstamp` int(11) NOT NULL default '0',
`user` varchar(255) NOT NULL default '',
- `data` text NOT NULL,
- `status` set('pending','ok','warning','error') NOT NULL default 'pending',
+ `data` longtext NOT NULL,
+ `status` set('pending','ok','warning','error') NOT NULL default 'ok',
PRIMARY KEY (`datalog_id`),
KEY `server_id` (`server_id`,`status`)
) ENGINE=MyISAM AUTO_INCREMENT=1;
@@ -1061,8 +1073,24 @@
`groups` varchar(255) NOT NULL default '',
`default_group` int(11) unsigned NOT NULL default '0',
`client_id` int(11) unsigned NOT NULL default '0',
+
PRIMARY KEY (`userid`)
) ENGINE=MyISAM AUTO_INCREMENT=1;
+
+-- --------------------------------------------------------
+
+--
+-- 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;
-- --------------------------------------------------------
@@ -1084,7 +1112,6 @@
`parent_domain_id` int(11) unsigned NOT NULL default '0',
`vhost_type` varchar(32) default NULL,
`document_root` varchar(255) default NULL,
- `document_root_www` varchar(255) default NULL,
`system_user` varchar(255) default NULL,
`system_group` varchar(255) default NULL,
`hd_quota` bigint(20) NOT NULL default '0',
@@ -1113,9 +1140,9 @@
`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,
- `custom_php_ini` 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',
@@ -1336,7 +1363,7 @@
-- Dumping data for table `sys_config`
--
-INSERT INTO sys_config VALUES ('1','db','db_version','3.0.3');
+INSERT INTO sys_config VALUES ('1','db','db_version','3.0.3.3');
-- --------------------------------------------------------
@@ -1599,6 +1626,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