From c5a8b2c72841ad0b58fb36870624737634778056 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sat, 13 Oct 2018 03:10:03 +0200 Subject: HTMLize instructions and use jinja2 to render them Only fixed tasks for the kpov_2018 class for now. --- kpov_judge/tasks/openvpn_simple_smb/task.py | 53 +++++++++++++---------------- 1 file changed, 23 insertions(+), 30 deletions(-) (limited to 'kpov_judge/tasks/openvpn_simple_smb') diff --git a/kpov_judge/tasks/openvpn_simple_smb/task.py b/kpov_judge/tasks/openvpn_simple_smb/task.py index d4bb510..dbc835c 100644 --- a/kpov_judge/tasks/openvpn_simple_smb/task.py +++ b/kpov_judge/tasks/openvpn_simple_smb/task.py @@ -1,40 +1,33 @@ # kpov_util should be imported by add_assignment.py instructions = { - 'si':""" -Postavi dva navidezna računalnika - SimpleArbiter z diska SimpleArbiterVPN ter -VPNClient1. Poskrbite, da bosta povezana med seboj in v Internet. -Na VPNClient1 namestite OpenVPN in program za nadzor nad virtualnimi napravami -(s katerim kreirate napravo tap). + 'si': '''\ +

+Postavi dva navidezna računalnika: SimpleArbiter in VPNClient1. Poskrbite, da bosta povezana med seboj in v internet. Na VPNClient1 namestite OpenVPN in program za nadzor nad virtualnimi napravami (s katerim kreirate napravo tap). -Na strežniku SimpleArbiterVPN že teče VPN strežnik in uporablja skrivnost, -ki jo najdete tudi na VPNClient1 v domačem imeniku uporabnika student. -Na VPNClient1 vzpostavite VPN tako, da napišete primerno datoteko z -nastavitvami. VPNClient1 na navideznem lokalnem omrežju nastavite naslov -{IP_VPNClient1} +

+Na strežniku SimpleArbiter že teče strežnik in uporablja skrivnost, ki jo najdete tudi na VPNClient1 v domačem imeniku uporabnika student. Na VPNClient1 vzpostavite VPN tako, da napišete primerno datoteko z nastavitvami. Računalniku VPNClient1 na navideznem lokalnem omrežju nastavite naslov +{{IP_VPNClient1}}. -Nato poskrbite, da bo na VPNClient1 na navideznem omrežju prek NFS omogočen -dostop do imenika /home/test/{DIRNAME}. -V ta imenik skopirajte datoteke, ki so prek SMB dostopne na SimpleArbiter. -""", - 'en':""" -Setup two virtual machines - SimpleArbiterVPN and a VPN client (VPNClient1). -Set the client's network up so that it has access to the internal network and -the internet. -On VPNClient1, install OpenVPN and a program for supervising virtual devices -(which you will use to create a tap device). On the VPN, set the IP for -VPNClient1 to {IP_VPNClient1}. +

+Nato poskrbite, da bo na VPNClient1 na navideznem omrežju prek NFS omogočen +dostop do imenika /home/test/{{DIRNAME}}. V ta imenik skopirajte datoteke, ki so prek SMB dostopne na SimpleArbiter. +''', + 'en': '''\ +

+Setup two virtual machines: SimpleArbiter and VPNClient1. Set the client's network up so that it has access to the internal network and the internet. On VPNClient1, install OpenVPN and a program for supervising virtual devices +(which you will use to create a tap device). On the VPN, set the IP for +VPNClient1 to {{IP_VPNClient1}}. -An OpenVPN server is already running on SimpleArbiterVPN. Use the secret -available on VPNClient1 in the home directory of user student to connect to -the VPN server on SimpleArbiterVPN. To do that, you will have to write your -own OpenVPN configuration file. +

+An OpenVPN server is already running on SimpleArbiter. Use the secret +available on VPNClient1 in the home directory of user student to connect to the VPN server on SimpleArbiter. To do that, you will have to write your +own OpenVPN configuration file. -After you have set up the VPN, make the directory -/home/test/{DIRNAME} on VPNClient1 available over NFS from SimpleArbiter over -your VPN. Copy files that are available from SimpleArbiter over SMB to -/home/test/{DIRNAME}. -""" +

+After you have set up the VPN, make the directory /home/test/{{DIRNAME}} on VPNClient1 available over NFS from SimpleArbiter over +your VPN. Copy files that are available from SimpleArbiter over SMB to /home/test/{{DIRNAME}}. +''' } computers = { -- cgit v1.2.1 From 481fd30e6cc6fc242e9471ce08f676f4883a3e69 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sat, 13 Oct 2018 19:16:45 +0200 Subject: Call write_default_config for arbiter in all KPOV 2018 tasks --- kpov_judge/tasks/openvpn_simple_smb/task.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'kpov_judge/tasks/openvpn_simple_smb') 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