From 3c235dd96eb478d5a3d4fc0244089a833cc5e2f8 Mon Sep 17 00:00:00 2001
From: Martin Polanka <PolankaMartin@gmail.com>
Date: Thu, 17 Dec 2015 16:02:13 +0100
Subject: [PATCH] Updated Assignments overview (markdown)

---
 Assignments-overview.md | 58 +++++++++++++++++++++++++++--------------
 1 file changed, 38 insertions(+), 20 deletions(-)

diff --git a/Assignments-overview.md b/Assignments-overview.md
index 75e295b..93b9fcc 100644
--- a/Assignments-overview.md
+++ b/Assignments-overview.md
@@ -54,63 +54,79 @@ Final configuration for worker is computer generated from those two configs.
 #### Configuration example
 
 ```
---- # only one document which contains job, aka. list of tasks and some general infos
-submission: # information about this particular submission
+---  # only one document which contains job, aka. list of tasks and some general infos
+submission:  # information about this particular submission
 	job-id: 255
-	time: 2015/12/09 22:22:22.0000
 	language: "cpp"
-files: # or can be in tasks, sha1 hashing function
+	file-collector:
+		hostname: "localhost"
+		port: 36587
+		username: "654321"  # can be ignored in specific modules
+		password: "123456"  # can be ignored in specific modules
+files:  # or can be in tasks, sha1 hashing function
 	"recodex.cpp": 94549d889ae96210ff2a73bd0a5bbe3185f05ff6
 	"01.in": 94549d889ae96210ff2a73bd0a5bbe3185f05ff6
 tasks:
 	- task-id: "compile_test01"
 	  priority: 1
-	  internal-task: false
 	  failure-exit: true
-	  source: "recodex.cpp"
-	  destination: "recodex"
 	  cmd: "g++"
+	  stdin: "recodex.cpp"
 	  stdout: "compile01.out"
 	  stderr: "compile01.err"
 	  log: "compile.log"
+	  sandbox:  # if defined task is external and will be run in sandbox
+		name: "isolate"
+		limits:
+			time: 5  # seconds
+			wall-time: 6  # seconds
+			extra-time: 2  # seconds
+			stack-size: 50000  # KB
+			memory: 50000  # in KB
+			parallel: false  # time and memory limits are merged from all potential processes/threads
+			disk-usage: 5  # MB
+			directory-bindings:
+				- "/tmp/prepared": "/box"
+				- "/tmp/skeleton": "/"
+			environ-variable:
+				ISOLATE_BOX: "/box"
+				ISOLATE_TMP: "/tmp"
 	- task-id: "move_test01"
 	  priority: 2
 	  internal-task: true
 	  dependencies:
 		- compile_test01
-      source: "recodex"
+	  source: "recodex"
 	  destination: "/codex/boxes/tmp/recodex"
 	  cmd: "mv"
 	  log: "move.log"
 	- task-id: "eval_test01"
 	  priority: 3
-	  internal-task: false
 	  failure-exit: false
 	  dependencies:
 		- move_test01
-	  source: "recodex"
-	  destination: ""
 	  cmd: "recodex -v -f 01.in"
 	  stdin: "01.in"
 	  stdout: "01.out"
 	  stderr: "01.err"
 	  log: "eval.log"
-	  sandbox: # if defined task will be run in sandbox
+	  sandbox:  # if defined task is external and will be run in sandbox
 		name: "isolate"
-	    limits:
-			time: 5 # seconds
-			wall-time: 6 # seconds
-			extra-time: 2 # seconds
-			stack-size: 50000 # KB
-			memory: 50000 # in KB
-			parallel: false # time and memory limits are merged from all potential processes/threads
-			disk-usage: 5 # MB
+		limits:
+			time: 5  # seconds
+			wall-time: 6  # seconds
+			extra-time: 2  # seconds
+			stack-size: 50000  # KB
+			memory: 50000  # in KB
+			parallel: false  # time and memory limits are merged from all potential processes/threads
+			disk-usage: 5  # MB
 			directory-bindings:
 				- "/tmp/prepared": "/box"
 				- "/tmp/skeleton": "/"
 			environ-variable:
 				ISOLATE_BOX: "/box"
 				ISOLATE_TMP: "/tmp"
+...
 ```
 
 ### Parameters And Results
@@ -126,6 +142,7 @@ Parameters are only read by the tasks (they can be used in task parameters). Som
 #### Example result file
 
 ```
+--- # only one document which contains job, aka. list of tasks and some general infos
 job-id: 5
 results:
 	- task-id: compile1
@@ -142,6 +159,7 @@ results:
 	  .
 	  .
 	  .
+...
 ```
 
 ### Logs