From 8b5ccd302bd1497de721a25e4ce086bebf95173f Mon Sep 17 00:00:00 2001 From: tbrehm <t.brehm@ispconfig.org> Date: Sun, 08 Jun 2008 15:32:42 -0400 Subject: [PATCH] Fixed a problem with the logout when the php session has ended. --- install/sql/ispconfig3.sql | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql index ebd094f..a716547 100644 --- a/install/sql/ispconfig3.sql +++ b/install/sql/ispconfig3.sql @@ -16,6 +16,8 @@ -- Tabellenstruktur f�r Tabelle `client` -- +SET FOREIGN_KEY_CHECKS = 0; + CREATE TABLE `client` ( `client_id` bigint(20) NOT NULL auto_increment, `sys_userid` int(11) NOT NULL default '0', @@ -158,8 +160,12 @@ `dl_ratio` int(11) NOT NULL default '-1', `ul_bandwidth` int(11) NOT NULL default '-1', `dl_bandwidth` int(11) NOT NULL default '-1', - PRIMARY KEY (`ftp_user_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; + PRIMARY KEY (`ftp_user_id`), + KEY `active` (`active`), + KEY `server_id` (`server_id`), + KEY `username` (`username`), + KEY `quota_files` (`quota_files`) +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1; -- -- Daten f�r Tabelle `ftp_user` @@ -487,14 +493,11 @@ `updated` tinyint(4) NOT NULL default '0', `active` tinyint(4) NOT NULL default '1', PRIMARY KEY (`server_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=3 ; +) ENGINE=MyISAM DEFAULT CHARSET=latin1; -- -- Daten f�r Tabelle `server` -- - -INSERT INTO `server` (`server_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_name`, `mail_server`, `web_server`, `dns_server`, `file_server`, `db_server`, `vserver_server`, `config`, `updated`, `active`) VALUES -(1, 1, 1, 'riud', 'riud', 'r', 'Server 1', 1, 1, 1, 1, 1, 1, '[global]\nwebserver=apache\nmailserver=postfix\ndnsserver=mydns\n\n[server]\nip_address=192.168.0.105\nnetmask=255.255.255.0\ngateway=192.168.0.1\nhostname=server1.example.com\nnameservers=193.174.32.18,145.253.2.75\n\n[mail]\nmodule=postfix_mysql\nmaildir_path=/home/vmail/[domain]/[localpart]/\nhomedir_path=/home/vmail/\nmailuser_uid=5000\nmailuser_gid=5000\nmailuser_name=vmail\nmailuser_group=vmail\nrelayhost=\nrelayhost_user=\nrelayhost_password=\nmailbox_size_limit=0\nmessage_size_limit=0\n\n[getmail]\ngetmail_config_dir=/etc/getmail\n\n[web]\nwebsite_path=/var/clients/client[client_id]/web[website_id]\nwebsite_symlinks=/var/www/[website_domain]/:/var/clients/client[client_id]/[website_domain]/\nvhost_conf_dir=/etc/apache2/sites-available\nvhost_conf_enabled_dir=/etc/apache2/sites-enabled\n\n', 0, 1); -- -------------------------------------------------------- @@ -521,7 +524,6 @@ -- -------------------------------------------------------- - CREATE TABLE `shell_user` ( `shell_user_id` bigint(20) NOT NULL auto_increment, `sys_userid` int(11) NOT NULL default '0', @@ -539,8 +541,10 @@ `pgroup` varchar(255) default NULL, `shell` varchar(255) NOT NULL default '/bin/bash', `dir` varchar(255) default NULL, + `chroot` varchar(255) NOT NULL, PRIMARY KEY (`shell_user_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; +) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1; + -- -- Daten f�r Tabelle `shell_user` @@ -858,6 +862,7 @@ `ssl_cert` mediumtext NULL, `ssl_bundle` mediumtext NULL, `ssl_action` varchar(10) NULL, + `apache_directives` text, `active` varchar(255) NOT NULL default 'y', PRIMARY KEY (`domain_id`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; @@ -876,3 +881,5 @@ `times` tinyint(1) NOT NULL default '1', `login_time` timestamp NOT NULL default '0000-00-00 00:00:00' ); + +SET FOREIGN_KEY_CHECKS = 1; -- Gitblit v1.9.1