Fix paths and permissions.

diff --git a/TODO b/TODO
index b9039fdc4b688910f94d362226bb67e43c8469b6..17ef152b5ea89762dca9d8bad43aefddaa750ed7 100644 (file)
--- a/TODO
+++ b/TODO
@@ -17,7 +17,8 @@ New submitter:
 - Checking of contest time (and per-contestant exceptions)
 - Keeping history and pruning status files
 - Remember hashes
-- create tmp directory
+- multiple IP ranges per Access rule
 - contest: override failed check
 - contest: local history
+- contest: task status cache
 - utilitka, kterou si po soutezi mohou vsichni pretestovat na souteznich datech

diff --git a/bin/mo-create-public b/bin/mo-create-public
index ff91f92ee1b4f69c82c99e934d35a4a03905225c..deeca701c5915b3506f4b9acdee43162ac6d9c24 100755 (executable)
--- a/bin/mo-create-public
+++ b/bin/mo-create-public
@@ -19,7 +19,7 @@ done
 
 if [ -n "$REMOTE_SUBMIT" ] ; then
        mkdir -p submit
-       cp $H/submit/{contest,remote-submit,remote-status} submit/
+       cp $H/submit/{contest,remote-submit,remote-status} bin/
        mkdir -p submit/lib/perl5/{MO,Sherlock}
        cp $H/submit/MO/*.pm submit/lib/perl5/MO/
        cp $H/submit/lib/perl5/Sherlock/Object.pm submit/lib/perl5/Sherlock/

diff --git a/bin/mo-create-submit b/bin/mo-create-submit
index d2748157d364761cbd843553e16307796ae05067..ec209785d766db8e1099638b4eff1cdceb866d33 100755 (executable)
--- a/bin/mo-create-submit
+++ b/bin/mo-create-submit
@@ -24,6 +24,7 @@ for a in `cd $H && bin/mo-get-users` ; do
        mkdir -p solutions/$a
 done
 
-mkdir tmp
+rm -rf tmp
+mkdir -p tmp
 
 chown -R $REMOTE_SUBMIT_USER.$REMOTE_SUBMIT_GROUP $MO_ROOT/eval/submit

diff --git a/submit/MO/Submit.pm b/submit/MO/Submit.pm
index 18441dc791cc360ecff490debb6e498a6ca4f8c9..f85852cfb008f3a2aeb4dd7eb4d4e6b7072efd50 100644 (file)
--- a/submit/MO/Submit.pm
+++ b/submit/MO/Submit.pm
@@ -18,7 +18,7 @@ sub new($) {
        my $root = $ENV{"MO_ROOT"} or die "Environment variable MO_ROOT not set\n";
        my $self = {
                "Contest" => "CPSPC 2007",
-               "Server" => "localhost:8888",
+               "Server" => "kamzice.ms.mff.cuni.cz:8888",
                "Key" => "$mo/key.pem",         # Keys and certificates
                "Cert" => "$mo/cert.pem",
                "CACert" => "$mo/ca-cert.pem",

diff --git a/submit/config b/submit/config
index 811634934e1a5edde4749362b94fa0f0d84ffcc3..f52f8e5dd0afd9ef743c59045e6673557e79aa79 100644 (file)
--- a/submit/config
+++ b/submit/config
@@ -6,7 +6,7 @@ SubmitD {
 Port                   8888
 
 # Maximum number of connections allowed
-MaxConn                        4
+MaxConn                        60
 
 # Time in seconds after which inactive connections are closed (0=none)
 SessionTimeout         300
@@ -39,6 +39,20 @@ Access {
        PlainText       0
 
        # Maximum number of connections per IP address allowed
+       MaxConn         16
+}
+
+Access {
+       IP              195.113.18.125
+       Admin           0
+       PlainText       0
+       MaxConn         2
+}
+
+Access {
+       IP              10.10.8.0/24
+       Admin           0
+       PlainText       0
        MaxConn         2
 }
 
@@ -53,8 +67,12 @@ TraceCommands                1
 # Competition tasks
 
 Tasks {
-       Task plans
-       Task { Name world; OpenData 10; }
+#      Task plans
+#      Task { Name world; OpenData 10; }
+
+       Task            necklace
+       Task            nei
+       Task            town
 
        Extension       c cpp pas
        OpenDataExt     out

diff --git a/submit/contest b/submit/contest
index 0c2e0227a98528727a41b675f90ea7fdc67fcae6..4566c7ce9616aae7e48270492a2e10adca5e93f6 100755 (executable)
--- a/submit/contest
+++ b/submit/contest
@@ -8,7 +8,7 @@ use warnings;
 BEGIN {
        defined $ENV{"MO_ROOT"} or die "Please set MO_ROOT to the contest root directory first.\n";
 }
-use lib $ENV{"MO_ROOT"} . "/submit";
+use lib $ENV{"MO_ROOT"} . "/lib/perl5";
 use lib $ENV{"MO_ROOT"} . "/submit/lib/perl5";
 
 use MO::Submit;
@@ -159,7 +159,7 @@ sub start_refresh_timer($) {
        my ($go) = @_;
        stop_refresh_timer();
        refresh() if $go;
-       $refresh_timer_id = Glib::Timeout->add($conn->{"RefreshTimer}, \&timed_refresh);
+       $refresh_timer_id = Glib::Timeout->add($conn->{"RefreshTimer"}, \&timed_refresh);
 }
 
 sub stop_refresh_timer() {

diff --git a/submit/remote-status b/submit/remote-status
index 2b29f830c33772e2f3a833e4aae32aece75149e0..04610570f94c7796c7722283ba7566f7878b12d4 100755 (executable)
--- a/submit/remote-status
+++ b/submit/remote-status
@@ -6,7 +6,7 @@ use warnings;
 BEGIN {
        defined $ENV{"MO_ROOT"} or die "Please set MO_ROOT to the contest root directory first.\n";
 }
-use lib $ENV{"MO_ROOT"} . "/submit";
+use lib $ENV{"MO_ROOT"} . "/lib/perl5";
 use lib $ENV{"MO_ROOT"} . "/submit/lib/perl5";
 
 use MO::Submit;

diff --git a/submit/remote-submit b/submit/remote-submit
index 20917087b7f63b8f3ffa49c35827b25ca1841c62..ef30ccb73f1842ac1fbbb5ef1d28a5e2228bf376 100755 (executable)
--- a/submit/remote-submit
+++ b/submit/remote-submit
@@ -7,7 +7,7 @@ BEGIN {
        defined $ENV{"MO_ROOT"} or die "Please set MO_ROOT to the contest root directory first.\n";
 }
 use lib $ENV{"MO_ROOT"} . "/submit";
-use lib $ENV{"MO_ROOT"} . "/submit/lib/perl5";
+use lib $ENV{"MO_ROOT"} . "/lib/perl5";
 
 use MO::Submit;
 use Sherlock::Object;