From 30aa0891b8ef7204b899d90bf3757a5a1881d044 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 01 Nov 2007 16:54:45 -0400
Subject: [PATCH] - Enhanced the installation guides - added a daily cronjob for stats creation in the installer. - Fixed a bug in the spamfilter white / blacklist forms (thanks to satommy for reporting this) - fixed ssl cert path in vhost templates/web_domain_ssl.htm - fixed a bug in the apache plugin which prevented the copying of the standard error and index files.
---
install/sql/ispconfig3.sql | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 53 insertions(+), 7 deletions(-)
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index d96333f..04cb3c9 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -50,8 +50,16 @@
`limit_spamfilter_wblist` int(11) NOT NULL default '0',
`limit_spamfilter_user` int(11) NOT NULL default '0',
`limit_spamfilter_policy` int(11) NOT NULL default '0',
- `default_webserver` int(11) NOT NULL,
- `limit_web_ip` text NOT NULL,
+ `default_webserver` int(11) NOT NULL default '1',
+ `limit_web_ip` text,
+ `limit_web_domain` int(11) NOT NULL default '-1',
+ `limit_web_subdomain` int(11) NOT NULL default '-1',
+ `limit_web_aliasdomain` int(11) NOT NULL default '-1',
+ `limit_ftp_user` int(11) NOT NULL default '-1',
+ `limit_shell_user` int(11) NOT NULL default '0',
+ `default_dnsserver` int(10) unsigned NOT NULL default '1',
+ `limit_dns_zone` int(11) NOT NULL default '-1',
+ `limit_dns_record` int(11) NOT NULL default '-1',
`username` varchar(255) default NULL,
`password` varchar(255) default NULL,
`language` varchar(255) NOT NULL default 'en',
@@ -509,6 +517,33 @@
-- Daten f�r Tabelle `server_ip`
--
+-- --------------------------------------------------------
+
+
+CREATE TABLE `shell_user` (
+ `shell_user_id` bigint(20) NOT NULL auto_increment,
+ `sys_userid` int(11) NOT NULL default '0',
+ `sys_groupid` int(11) 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) NOT NULL default '0',
+ `parent_domain_id` int(11) NOT NULL default '0',
+ `username` varchar(255) default NULL,
+ `password` varchar(255) default NULL,
+ `quota_size` int(11) NOT NULL default '-1',
+ `active` varchar(255) NOT NULL default 'y',
+ `puser` varchar(255) default NULL,
+ `pgroup` varchar(255) default NULL,
+ `shell` varchar(255) NOT NULL default '/bin/bash',
+ `dir` varchar(255) default NULL,
+ PRIMARY KEY (`shell_user_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+
+--
+-- Daten f�r Tabelle `shell_user`
+--
+
-- --------------------------------------------------------
@@ -779,7 +814,7 @@
-- Daten f�r Tabelle `sys_user`
--
-INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `username`, `passwort`, `modules`, `startmodule`, `app_theme`, `typ`, `active`, `language`, `groups`, `default_group`, `client_id`) VALUES (1, 1, 0, 'riud', 'riud', '', 'admin', '21232f297a57a5a743894a0e4a801fc3', 'admin,client,mail,monitor,sites', 'mail', 'default', 'admin', 1, 'en', '1,2', 1, 0);
+INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `username`, `passwort`, `modules`, `startmodule`, `app_theme`, `typ`, `active`, `language`, `groups`, `default_group`, `client_id`) VALUES (1, 1, 0, 'riud', 'riud', '', 'admin', '21232f297a57a5a743894a0e4a801fc3', 'admin,client,mail,monitor,sites,dns', 'mail', 'default', 'admin', 1, 'en', '1,2', 1, 0);
-- --------------------------------------------------------
@@ -805,15 +840,26 @@
`system_group` varchar(255) default NULL,
`hd_quota` int(11) NOT NULL default '0',
`traffic_quota` int(11) NOT NULL default '0',
- `cgi` varchar(255) NOT NULL default 'y',
- `ssi` varchar(255) NOT NULL default 'y',
- `suexec` varchar(255) NOT NULL default 'y',
+ `cgi` char(1) NOT NULL default 'y',
+ `ssi` char(1) NOT NULL default 'y',
+ `suexec` char(1) NOT NULL default 'y',
`php` varchar(255) NOT NULL default 'y',
`redirect_type` varchar(255) default NULL,
`redirect_path` varchar(255) default NULL,
+ `ssl` enum('n','y') NOT NULL default 'n',
+ `ssl_state` varchar(255) NOT NULL,
+ `ssl_locality` varchar(255) NOT NULL,
+ `ssl_organisation` varchar(255) NOT NULL,
+ `ssl_organisation_unit` varchar(255) NOT NULL,
+ `ssl_country` varchar(255) NOT NULL,
+ `ssl_request` mediumtext NOT NULL,
+ `ssl_cert` mediumtext NOT NULL,
+ `ssl_bundle` mediumtext NOT NULL,
+ `ssl_action` varchar(10) NOT NULL,
`active` varchar(255) NOT NULL default 'y',
PRIMARY KEY (`domain_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+
--
-- Daten f�r Tabelle `web_domain`
--
Gitblit v1.9.1