From 91f44a34afc80be20a8f9de9b07e9b0099275fe8 Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Sun, 10 Jun 2007 16:35:18 +0200
Subject: [PATCH] Fix paths and permissions.

---
 TODO                 |  3 ++-
 bin/mo-create-public |  2 +-
 bin/mo-create-submit |  3 ++-
 submit/MO/Submit.pm  |  2 +-
 submit/config        | 24 +++++++++++++++++++++---
 submit/contest       |  4 ++--
 submit/remote-status |  2 +-
 submit/remote-submit |  2 +-
 8 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/TODO b/TODO
index b9039fd..17ef152 100644
--- 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 ff91f92..deeca70 100755
--- 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 d274815..ec20978 100755
--- 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 18441dc..f85852c 100644
--- 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 8116349..f52f8e5 100644
--- 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 0c2e022..4566c7c 100755
--- 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 2b29f83..0461057 100755
--- 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 2091708..ef30ccb 100755
--- 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;
-- 
2.39.2