From 8bd9922ca3841dbdf6210b75fcc9f2aa9de4e082 Mon Sep 17 00:00:00 2001 From: cassiopc Date: Thu, 25 Oct 2012 11:13:16 +0200 Subject: added comment on apache config, fixed bug of usernames, improved description in ADMIN.txt --- boca-1.5.2/doc/ADMIN.txt | 5 ++- boca-1.5.2/doc/APACHE.txt | 88 +++++++++++++++++++++++++++++++++++++++++ boca-1.5.2/doc/changelog.txt | 6 +++ boca-1.5.2/src/optionlower.php | 2 +- boca-1.5.2/tools/icpc.etc.tgz | Bin 9493 -> 9493 bytes 5 files changed, 99 insertions(+), 2 deletions(-) create mode 100644 boca-1.5.2/doc/APACHE.txt (limited to 'boca-1.5.2') diff --git a/boca-1.5.2/doc/ADMIN.txt b/boca-1.5.2/doc/ADMIN.txt index 7dc83ad..9a1d0d2 100644 --- a/boca-1.5.2/doc/ADMIN.txt +++ b/boca-1.5.2/doc/ADMIN.txt @@ -142,7 +142,10 @@ create the warm-up problems e.g. using letters plus a dot, like A., B., and then the contest problem with A, B, C, D... Then, to run the warm-up, one might delete all the contest problems, which later can be undeleted for the real contest, -while the warm-up problem deleted. +while the warm-up problem deleted. Do not forget to delete all +clarification, runs, tasks and bkps between warump and real +contest. This can be done from the tab Site (there are four buttons +there, one for deleting each of these items). * Problem package (ZIP): a zip file (encrypted or not) containing all information about the problem. See below for a description diff --git a/boca-1.5.2/doc/APACHE.txt b/boca-1.5.2/doc/APACHE.txt new file mode 100644 index 0000000..998f0cf --- /dev/null +++ b/boca-1.5.2/doc/APACHE.txt @@ -0,0 +1,88 @@ +COMMENTS ON THE CONFIGURATION OF APACHE FOR LARGE SITES +----------------------------------------------------- +(File last updated on 25/October/2012) + +If you have a large site, for instance with more than 50 teams, then +the best practice is to decrease the number of threads/servers that +apache starts (yes, I said to DECREASE). The problem is that the computers +are not so powerful, and apache is usually configured with too many of them. +If there are too many requests, instead of queuing them, apache tries to +answer all in parallel, and the server suffers a lot. This can be changed in the +/etc/apache2/apache.conf file, as below (well, the exact values to use +depend on your site, the original config has too high numbers): + + +# prefork MPM +# StartServers: number of server processes to start +# MinSpareServers: minimum number of server processes which are kept spare +# MaxSpareServers: maximum number of server processes which are kept spare +# MaxClients: maximum number of server processes allowed to start +# MaxRequestsPerChild: maximum number of requests a server process serves + + StartServers 3 + MinSpareServers 3 + MaxSpareServers 6 + MaxClients 40 + MaxRequestsPerChild 0 + + +# worker MPM +# StartServers: initial number of server processes to start +# MinSpareThreads: minimum number of worker threads which are kept spare +# MaxSpareThreads: maximum number of worker threads which are kept spare +# ThreadLimit: ThreadsPerChild can be changed to this maximum value during a +# graceful restart. ThreadLimit can only be changed by stopping +# and starting Apache. +# ThreadsPerChild: constant number of worker threads in each server process +# MaxClients: maximum number of simultaneous client connections +# MaxRequestsPerChild: maximum number of requests a server process serves + + StartServers 2 + MinSpareThreads 10 + MaxSpareThreads 30 + ThreadLimit 32 + ThreadsPerChild 10 + MaxClients 40 + MaxRequestsPerChild 0 + + +# event MPM +# StartServers: initial number of server processes to start +# MinSpareThreads: minimum number of worker threads which are kept spare +# MaxSpareThreads: maximum number of worker threads which are kept spare +# ThreadsPerChild: constant number of worker threads in each server process +# MaxClients: maximum number of simultaneous client connections +# MaxRequestsPerChild: maximum number of requests a server process serves + + StartServers 2 + MinSpareThreads 10 + MaxSpareThreads 30 + ThreadLimit 32 + ThreadsPerChild 10 + MaxClients 40 + MaxRequestsPerChild 0 + + + + +Contacts and Copyrights +----------------------- +BOCA Copyright (c) 2003- Cassio Polpo de Campos (cassio@ime.usp.br) +http://www.ime.usp.br/~cassio/boca + +//////////////////////////////////////////////////////////////////////////////// +//BOCA Online Contest Administrator +// Copyright (C) 2003-2012 by BOCA Development Team (bocasystem@gmail.com) +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +//////////////////////////////////////////////////////////////////////////////// diff --git a/boca-1.5.2/doc/changelog.txt b/boca-1.5.2/doc/changelog.txt index c11f377..83e837a 100644 --- a/boca-1.5.2/doc/changelog.txt +++ b/boca-1.5.2/doc/changelog.txt @@ -1,3 +1,9 @@ +version 1.5.2: +(THIS VERSION IS IN DEVEL AND CAN BE CHANGED AT ANY TIME) +- improve description of inbetween warmup and contest in ADMIN.txt +- fix a bug that could allow an user to change their username +- creation of an APACHE.txt doc about setting up apache configuration + version 1.5.1: 2012/10/20: - (ICPC Linux) fixed logging in issue after cleandisk.sh diff --git a/boca-1.5.2/src/optionlower.php b/boca-1.5.2/src/optionlower.php index 3bca5f9..a813700 100644 --- a/boca-1.5.2/src/optionlower.php +++ b/boca-1.5.2/src/optionlower.php @@ -37,7 +37,7 @@ if (isset($_GET["username"]) && isset($_GET["userfullname"]) && isset($_GET["use DBUserUpdate($_SESSION["usertable"]["contestnumber"], $_SESSION["usertable"]["usersitenumber"], $_SESSION["usertable"]["usernumber"], - $username, + $_SESSION["usertable"]["username"], // $username, but users should not change their names $userfullname, $userdesc, $passwordo, diff --git a/boca-1.5.2/tools/icpc.etc.tgz b/boca-1.5.2/tools/icpc.etc.tgz index d013a03..5b5d8c0 100644 Binary files a/boca-1.5.2/tools/icpc.etc.tgz and b/boca-1.5.2/tools/icpc.etc.tgz differ -- cgit v1.2.3