From 481fd30e6cc6fc242e9471ce08f676f4883a3e69 Mon Sep 17 00:00:00 2001
From: Timotej Lazar <timotej.lazar@fri.uni-lj.si>
Date: Sat, 13 Oct 2018 19:16:45 +0200
Subject: Call write_default_config for arbiter in all KPOV 2018 tasks

---
 kpov_judge/tasks/copy_rename_20_files_tail_env/task.py | 7 ++-----
 kpov_judge/tasks/ldap_search/task.py                   | 1 -
 kpov_judge/tasks/mock_entrance_exam/task.py            | 3 +++
 kpov_judge/tasks/openvpn_simple_smb/task.py            | 2 ++
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/kpov_judge/tasks/copy_rename_20_files_tail_env/task.py b/kpov_judge/tasks/copy_rename_20_files_tail_env/task.py
index b65161d..6a4b18a 100644
--- a/kpov_judge/tasks/copy_rename_20_files_tail_env/task.py
+++ b/kpov_judge/tasks/copy_rename_20_files_tail_env/task.py
@@ -290,11 +290,7 @@ def task_check(results, params):
     return score, hints
 
 def prepare_disks(templates, task_params, global_params):
-#    d = templates['simpleArbiterDhcp']
     import random
-    #print "Haha!"
-    #print params
-    #print templates
     d = templates['malishell']
     r = random.Random(task_params['file_creator_random_seed'])
     # rename
@@ -353,4 +349,5 @@ def prepare_disks(templates, task_params, global_params):
     d.mkdir(task_params['wc_dirname'])
     d.chown(1000, 1000, task_params['wc_dirname'])
     d.write("{}".format(os.path.join(task_params['wc_dirname'], 'count.txt')), "".join(lx))
-    #write_default_config(templates['simpleArbiterDhcpGW'], global_params)
+
+    write_default_config(templates['simpleArbiterDhcpGW'], global_params)
diff --git a/kpov_judge/tasks/ldap_search/task.py b/kpov_judge/tasks/ldap_search/task.py
index 485a2ae..29117db 100644
--- a/kpov_judge/tasks/ldap_search/task.py
+++ b/kpov_judge/tasks/ldap_search/task.py
@@ -208,4 +208,3 @@ objectClass: organization\r
 
 def prepare_disks(templates, task_params, global_params):
     write_default_config(templates['simpleArbiterDhcpGWLDAP'], global_params)
-
diff --git a/kpov_judge/tasks/mock_entrance_exam/task.py b/kpov_judge/tasks/mock_entrance_exam/task.py
index 84dff82..01d4fa5 100644
--- a/kpov_judge/tasks/mock_entrance_exam/task.py
+++ b/kpov_judge/tasks/mock_entrance_exam/task.py
@@ -309,3 +309,6 @@ nohup {} &
 
 exit 0
 """.format(sh_path, task_params['net_prog_name']))
+
+def prepare_disks(templates, task_params, global_params):
+    write_default_config(templates['simpleArbiter'], global_params)
diff --git a/kpov_judge/tasks/openvpn_simple_smb/task.py b/kpov_judge/tasks/openvpn_simple_smb/task.py
index dbc835c..5d7c22f 100644
--- a/kpov_judge/tasks/openvpn_simple_smb/task.py
+++ b/kpov_judge/tasks/openvpn_simple_smb/task.py
@@ -257,3 +257,5 @@ iface tap0 inet static
     templates['student-VPNClient1'].write("/home/student/" + keyfile, s)
     # uid, gid (student = )
     templates['student-VPNClient1'].chown(1000, 1000, "/home/student/" + keyfile) 
+
+    write_default_config(templates['simpleArbiterDhcpGWVPN'], global_params)
-- 
cgit v1.2.1