Računalniki v vaji

Računalniki

{% for c in computers %} -

{% if 'disk_urls' in c %}

{% for u in c['disk_urls'] %} @@ -27,16 +69,12 @@ {% else %} Slike navideznih diskov so v izdelavi in bodo kmalu na voljo. {% endif %} +

{% endfor %} -

- -

{% if backing_images %} -

Osnovne slike

{{b}}

Rezultati

-Lahko si ogledate surove: +Ogledate si lahko:

rezultate (json)
parametre (json, opisi parametrov)

+{#

{% if openstack %} Openstack projekt za to vajo je že ustvarjen ali v izdelavi (funkcionalnost še ne deluje). {% else %} Ustvari Openstack projekt za to vajo (funkcionalnost še ne deluje). {% endif %} +#} + -- cgit v1.2.1 From 08a3e2857d1241ec1d908094d7f52e7331f4c738 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Thu, 11 Oct 2018 23:08:52 +0200 Subject: web: remove duplicate function --- kpov_judge/web/kpov_judge/kpov_judge.py | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/kpov_judge/web/kpov_judge/kpov_judge.py b/kpov_judge/web/kpov_judge/kpov_judge.py index 1085b9b..5aa0606 100755 --- a/kpov_judge/web/kpov_judge/kpov_judge.py +++ b/kpov_judge/web/kpov_judge/kpov_judge.py @@ -36,9 +36,9 @@ def before_request(): @app.route('/') -def root(): +@app.route('/classes/') +def index(): student_id = flask.app.request.environ.get('REMOTE_USER', 'Nobody') - # env = flask.app.request.environ classes = g.db.classes.find({}, {'class_id': 1, 'name': 1}).sort('class_id') return render_template('index.html', student_id=student_id, classes=classes) @@ -46,7 +46,6 @@ def root(): @app.route('/classes//') def class_tasks(class_id): student_id = flask.app.request.environ.get('REMOTE_USER', 'Nobody') - # env = flask.app.request.environ clas = g.db.classes.find_one({'class_id': class_id}) tasks = g.db.tasks.find({'class_id': class_id}, {'task_id': 1}).sort('task_id') if tasks is not None: @@ -56,14 +55,6 @@ def class_tasks(class_id): return render_template('class_tasks.html', student_id=student_id, tasks=task_list, clas=clas) -@app.route('/classes/') -def class_list(): - student_id = flask.app.request.environ.get('REMOTE_USER', 'Nobody') - # env = flask.app.request.environ - classes = g.db.classes.find({}, {'class_id': 1, 'name': 1,}).sort('name') - return render_template('class_list.html', student_id=student_id, classes=classes) - - def results_post(class_id, task_id, results): student_id = flask.app.request.environ.get('REMOTE_USER', 'Nobody') db = g.db -- cgit v1.2.1 From 0069a58683b6404aff4ad9249cfb70397b073e55 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Thu, 11 Oct 2018 23:23:20 +0200 Subject: web: improve style --- kpov_judge/web/kpov_judge/static/style.css | 46 ++++++++++++++++----- .../web/kpov_judge/templates/class_tasks.html | 16 ++++++++ kpov_judge/web/kpov_judge/templates/index.html | 17 ++++---- .../web/kpov_judge/templates/task_greeting.html | 47 +++++++++------------- 4 files changed, 77 insertions(+), 49 deletions(-) create mode 100644 kpov_judge/web/kpov_judge/templates/class_tasks.html diff --git a/kpov_judge/web/kpov_judge/static/style.css b/kpov_judge/web/kpov_judge/static/style.css index 9be13f8..ade0909 100644 --- a/kpov_judge/web/kpov_judge/static/style.css +++ b/kpov_judge/web/kpov_judge/static/style.css @@ -1,15 +1,37 @@ -.hover { - position:relative; +a.back { + text-decoration: none; +} + +body { + margin: 0 auto; + max-width: 60em; + padding: 1em 2em; +} + +h1 { + margin-bottom: 0.5em; +} + +p { + hyphens: auto; + margin-top: 0.5em; + margin-bottom: 0; + padding-top: 0; + text-align: justify; +} + +pre { + margin-left: 1em; } .tooltip { /* hide and position tooltip */ - top:1em; - left:1em; - background-color:black; - color:white; - border-radius:5px; - opacity:0; - position:absolute; + top: 1em; + left: 1em; + background-color: black; + color: white; + border-radius: 5px; + opacity: 0; + position: absolute; -webkit-transition: opacity 0.5s; -moz-transition: opacity 0.5s; -ms-transition: opacity 0.5s; @@ -17,6 +39,10 @@ transition: opacity 0.5s; } +.hover { + position: relative; +} + .hover:hover .tooltip { /* display tooltip on hover */ - opacity:1; + opacity: 1; } diff --git a/kpov_judge/web/kpov_judge/templates/class_tasks.html b/kpov_judge/web/kpov_judge/templates/class_tasks.html new file mode 100644 index 0000000..5a29ae7 --- /dev/null +++ b/kpov_judge/web/kpov_judge/templates/class_tasks.html @@ -0,0 +1,16 @@ + + + +

↩ {{clas.name}}

+ +

+Zdravo, {{student_id}}. + +

+Trenutno so na voljo naloge: + +

{{t}} +{% endfor %} +

diff --git a/kpov_judge/web/kpov_judge/templates/index.html b/kpov_judge/web/kpov_judge/templates/index.html index b5149ab..49895b0 100644 --- a/kpov_judge/web/kpov_judge/templates/index.html +++ b/kpov_judge/web/kpov_judge/templates/index.html @@ -1,20 +1,17 @@ - + + +

KPOV Judge

-Zdravo, {{student_id}} -

-{{env}} -

+Zdravo, {{student_id}}. +

Trenutno so na voljo predmeti: +

{{c.name}}

Navodila lahko najdete na strani LUSY. - - diff --git a/kpov_judge/web/kpov_judge/templates/task_greeting.html b/kpov_judge/web/kpov_judge/templates/task_greeting.html index 217c0ca..20da231 100644 --- a/kpov_judge/web/kpov_judge/templates/task_greeting.html +++ b/kpov_judge/web/kpov_judge/templates/task_greeting.html @@ -1,14 +1,7 @@ + -

↩ {{task_id}}

Navodila

{{instructions}} @@ -56,25 +42,30 @@ section.disks > section > ul {

Računalniki

+Slike diskov za to nalogo: {% for c in computers %} -

{{c['name']}} {% if 'disk_urls' in c %}
- {{u['name']}}
- {{u['name']}} {% endfor %}
{% else %} Slike navideznih diskov so v izdelavi in bodo kmalu na voljo. {% endif %} -

+ {% endfor %}

{% if backing_images %}

Osnovne slike

+Te slike so enake za vse naloge in jih prenesete samo enkrat. +

{{b}}

Rezultati

Ogledate si lahko: +

rezultate (json)
parametre (json, opisi parametrov)

Ustvari

Date: Fri, 12 Oct 2018 01:15:55 +0200 Subject: Add .gitignore --- kpov_judge/.gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 kpov_judge/.gitignore diff --git a/kpov_judge/.gitignore b/kpov_judge/.gitignore new file mode 100644 index 0000000..7bfcd7a --- /dev/null +++ b/kpov_judge/.gitignore @@ -0,0 +1,2 @@ +__pycache__/ +*.pyc \ No newline at end of file -- cgit v1.2.1 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/basic_network_gcc/task.py | 33 +++--- kpov_judge/tasks/copy_rename_100_files/task.py | 8 +- .../tasks/copy_rename_20_files_tail_env/task.py | 113 +++++++++------------ kpov_judge/tasks/custom_rdate/task.py | 49 ++++----- kpov_judge/tasks/dhcp_dns_predefined_ip/task.py | 2 +- .../tasks/edit_find_grep_compile_convert/task.py | 65 +++++------- kpov_judge/tasks/isc_dhcp_live_boot/task.py | 82 ++++++--------- kpov_judge/tasks/ldap_import/task.py | 5 +- kpov_judge/tasks/ldap_search/task.py | 87 ++++++++++------ kpov_judge/tasks/mock_entrance_exam/task.py | 67 ++++++------ kpov_judge/tasks/nat_port_forward/task.py | 5 +- kpov_judge/tasks/nat_vlc/task.py | 46 ++++----- .../tasks/network_boot_custom_program/task.py | 4 +- kpov_judge/tasks/openvpn_multiple_hops/task.py | 4 +- kpov_judge/tasks/openvpn_simple_smb/task.py | 53 +++++----- kpov_judge/tasks/openwrt/task.py | 4 +- kpov_judge/tasks/public_ip_ssh/task.py | 4 +- kpov_judge/tasks/public_ssh_motd_http/task.py | 4 +- kpov_judge/tasks/radius_multiple_realms/task.py | 4 +- kpov_judge/tasks/radius_mysql_pam/task.py | 65 ++++++------ kpov_judge/tasks/rdate_64bit/task.py | 4 +- kpov_judge/tasks/rename_grep_network/task.py | 4 +- kpov_judge/tasks/set_ip_dhcp_hostname/task.py | 4 +- kpov_judge/tasks/set_ip_static_dhcp/task.py | 48 ++++----- kpov_judge/tasks/set_motd/task.py | 51 +++++----- kpov_judge/tasks/smb_nfs/task.py | 30 +++--- kpov_judge/tasks/snmp_agent_uptime/task.py | 81 ++++++++------- kpov_judge/tasks/snmp_alarms_interfaces/task.py | 4 +- kpov_judge/tasks/vlc_stream_rtp/task.py | 39 ++++--- kpov_judge/web/kpov_judge/kpov_judge.py | 12 +-- .../web/kpov_judge/templates/class_tasks.html | 2 +- .../web/kpov_judge/templates/task_greeting.html | 3 +- 32 files changed, 480 insertions(+), 506 deletions(-) diff --git a/kpov_judge/tasks/basic_network_gcc/task.py b/kpov_judge/tasks/basic_network_gcc/task.py index c4c4393..b23c060 100644 --- a/kpov_judge/tasks/basic_network_gcc/task.py +++ b/kpov_judge/tasks/basic_network_gcc/task.py @@ -5,29 +5,30 @@ # - switch to a real SSH/SFTP client to properly handle filenames instructions = { - 'si': ''' -Postavite dva navidezna računalnika - SimpleArbiter in Student. -Oba naj bosta povezana na internet. Poleg tega mora biti -Student na naslovu {student_IP} dostopen s SimpleArbiter. + 'si': '''\ +

+Postavite dva navidezna računalnika: SimpleArbiter in Student. Oba naj bosta povezana na internet. Poleg tega mora biti Student na naslovu {{student_IP} dostopen s SimpleArbiter. -Računajte, da se na Student ob zagonu zažene program {net_prog_name}, +

+Računajte, da se na Student ob zagonu zažene program {{net_prog_name}, ki vam spreminja nastavitve mrežne kartice. -V domačem imeniku uporabnika student obstaja program {P_c} v programskem jeziku C. -Prevedite ga v program z imenom {P_executable}. -Izvorna koda je namenoma pokvarjena tako, da so vanjo vrinjeni nepotrebni znaki. +

+V domačem imeniku uporabnika student obstaja program {{P_c} v programskem jeziku C. Prevedite ga v program z imenom {{P_executable}. Izvorna koda je namenoma pokvarjena tako, da so vanjo vrinjeni nepotrebni znaki. Pred prevajanjem jo morate popraviti. -Napišite skripto ali program {P_script} v domačem imeniku uporabnika student, ki: -- požene {P_executable} z argumentom "{arg_c}" in mu na standardni vhod - pripelje vrednost spremenljivke {env_c} -- vse, kar {P_executable} izpiše na stderr, spravi v datoteko {out_stderr_c}. -- vse vrstice, ki jih {P_executable} izpiše na stdout in vsebujejo - zaporedje znakov "ma", zapiše v {out_stdout_c}. +

+Napišite skripto ali program {{P_script} v domačem imeniku uporabnika student, ki +

požene {{P_executable} z argumentom {{arg_c} in mu na standardni vhod pripelje vrednost spremenljivke {{env_c}; +
vse, kar {{P_executable} izpiše na stderr, spravi v datoteko {{out_stderr_c}; +
vse vrstice, ki jih {{P_executable} izpiše na stdout in vsebujejo zaporedje znakov ma, zapiše v {{out_stdout_c}. +

-Lastnik vseh ustvarjenih datotek mora biti uporabnik student. -Gesla uporabnika student (vaje) ne smete spreminjati.''', +

+Lastnik vseh ustvarjenih datotek mora biti uporabnik student. Gesla uporabnika student (vaje) ne smete spreminjati. +''', 'en': ''' ''', } diff --git a/kpov_judge/tasks/copy_rename_100_files/task.py b/kpov_judge/tasks/copy_rename_100_files/task.py index 051f9f7..9dcf69a 100644 --- a/kpov_judge/tasks/copy_rename_100_files/task.py +++ b/kpov_judge/tasks/copy_rename_100_files/task.py @@ -6,20 +6,20 @@ instructions = { 'si':""" -Ustvari dva navidezna računalnika. Za prvega uporabi sliko diska simpleArbiterDhcp. Na drugem računalniku +

Ustvari dva navidezna računalnika. Za prvega uporabi sliko diska simpleArbiterDhcp. Na drugem računalniku
 ustvari uporabnika test z geslom test.
 Na sliki diska simpleArbiterDhcp najdeš imenik s 100 datotekami. Prekopiraj vse datoteke na drugi računalnik v domači imenik uporabnika test.
 Spremeni vsebino datotek tako, da vse male črke spremeniš v velike.  Poskrbi, da se bo s prvega računalnika (simpleArbiterDhcp) mogoče prek
-ssh prijaviti na drugi računalnik in prebrati predelane datoteke.
+ssh prijaviti na drugi računalnik in prebrati predelane datoteke.

""", 'en': ''' -Create two virtual machines. For the first, use the `simpleArbiterDhcp' image. +

Create two virtual machines. For the first, use the `simpleArbiterDhcp' image.
 On the second machine, create a user `test' with the password `test'.
 The `simpleArbiterDhcp' disk image contains a folder with 100 files. Copy all
 of these files to the other computer into the home folder of theuser `test'.
 Modify the content of these files by converting all lowercase letters into
 uppercase. Make sure that the first machine (`simpleArbiterDhcp') can use ssh
-to access the second machine and read the processed files.
+to access the second machine and read the processed files.

''', } 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 aa57d3e..b65161d 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 @@ -1,69 +1,56 @@ # kpov_util should be imported by add_assignment.py -# TODO (polz): instructions = { - 'si':""" -Prijavi se na sistem kot uporabnik student z geslom vaje. -V domači mapi najdeš imenik {file_rename_dirname} z 20 datotekami. - - Preimenuj vse datoteke tako, da zamenjaš minuse s podčrtaji - - Napiši najkrajši ukaz v bash, ki vse datoteke iz imenika {mv_src_dir} - premakne v imenik {mv_dst_dir}. Ukaz spravi v - /home/student/mv_ukaz. Pazi, da bodo ob testiranju v izvornem imeniku ISTE - datoteke, kot so bile, ko je bila virtualka nova, ciljni imenik pa bo - prazen. To pomeni, da boste verjetno morali po vsakem testiranju datoteke - premakniti nazaj. Za krajšanje ukaza lahko izkoristite imeni imenikov. - - Napiši ukaz, ki s pomočjo ukaza grep v datoteko ~/mama.txt izpiše imena vseh - navadnih (ne skritih) datotek v trenutnem imeniku, ki vsebujejo niz "mama", - v datoteko ~/napake.txt pa izpiše vse morebitne napake (npr. to, da so nekateri - objekti v trenutnem imeniku dejansko imeniki ali napačne simbolične povezave). - Ukaz spravite v datoteko /home/student/mama_ukaz. - - Napiši program (lahko v bash), ki bo 5s sledil vsebini /var/log/syslog. V - primeru, da se v syslogu pojavi niz "zmeda", naj program izpiše "imam ga". - Poleg tega naj program med sledenjem syslog-u odšteva od 5 do 1 (vsako sekundo - naj se izpiše naslednja številka. Program naj bo v /home/student/syslog_ukaz.sh - - Namesti paket "cowsay" in ga preizkusi :) - - S pomočjo programa cURL preštej število pojavitev niza "images" v html kodi, - ki jo dobiš na naslovu http://localhost/{curl_fname} na malishell in število zapiši - v spremenljivko $images na simpleArbiterDhcpGW v lupini, kjer poganjaš - task_check.py - - V imeniku {wc_dirname} najdeš datoteko count.txt. Preštej število prehodov - v novo vrstico v count.txt in rezultat zapiši v novo datoteko - lines.txt - v istem imeniku. -""", - 'en':""" -Log into the system as student using vaje as your password. -In your home folder you will find a directory called {file_rename_dirname} - containing 20 files. - - Rename all files in that directory replacing all dashes with - underscores - - Find the shortest command for copying all the files located in - {mv_src_dir} into the folder {mv_dst_dir}. - Create a shell script /home/student/mv_ukaz containing this command. - Before running test_task, make sure {mv_src_dir} contains the same - files as when you downloaded your virtual disk. This probably means - that you will have to move the files back from {mv_dst_dir} to - {mv_src_dir} after each test. You can use the directory na - - Come up with a command or sequence of commands in bash which will, - using grep, write the names all normal (not hidden) files which contain - the string "mama" and are located in the working directory (pwd) - into the file ~/mama.txt while writing errors such as files in current - directory being folders or symbolic links in the file called - "napake.txt". Write this command to mama_ukaz. - - Write a program (which may be a shell script) that will track the contents - of /var/log/syslog for 5s. Every time an entry containing the string "zmeda" - appears in the syslog, the script should output "imam ga". - In addition, the script should count down from 5 to 1 with a 1 second - interval. Store the script in /home/student/syslog_ukaz.sh . - - Install the packet "cowsay" and test it :) - - With the help of cURL count the number of occurences of the string - "images" on the web page accessible from malishell at - http://localhost/{curl_fname}. - On simpleArbiterDhcpGW within the shell where you are running test_task.py, set - the environment variable $images to this number. - - In the directory {wc_dirname} there is a file called count.txt. Write the - number of newlines in this file into the file lines.txt in the same - directory. -""" + 'si': '''\ +

+Prijavi se na sistem kot uporabnik student z geslom vaje. + +

+V domači mapi najdeš imenik {{file_rename_dirname}} z 20 datotekami. Preimenuj vse datoteke tako, da zamenjaš minuse s podčrtaji. + +

+Napiši najkrajši ukaz v bash, ki vse datoteke iz imenika {{mv_src_dir}} premakne v imenik {{mv_dst_dir}}. Ukaz spravi v /home/student/mv_ukaz. Pazite, da bodo ob testiranju v izvornem imeniku iste datoteke, kot so bile, ko je bila virtualka nova, ciljni imenik pa bo prazen. To pomeni, da boste verjetno morali po vsakem testiranju datoteke premakniti nazaj. Za krajšanje ukaza lahko izkoristite imeni imenikov. + +

+Napiši ukaz, ki s pomočjo ukaza grep v datoteko ~/mama.txt izpiše imena vseh navadnih (ne skritih) datotek v trenutnem imeniku, ki vsebujejo niz mama, v datoteko ~/napake.txt pa izpiše vse morebitne napake (npr. to, da so nekateri objekti v trenutnem imeniku dejansko imeniki ali napačne simbolične povezave). Ukaz spravite v datoteko /home/student/mama_ukaz. + +

+Napiši program (lahko v bash), ki bo pet sekund sledil vsebini /var/log/syslog. V primeru, da se v syslogu pojavi niz zmeda, naj program izpiše imam ga. Poleg tega naj program med sledenjem syslog-u odšteva od 5 do 1 (vsako sekundo naj se izpiše naslednja številka). Program naj bo v /home/student/syslog_ukaz.sh. + +

+Namesti paket cowsay in ga preizkusi. 😊 + +

+S pomočjo programa curl preštej število pojavitev niza images v spletni strani, ki jo dobiš na naslovu http://localhost/{{curl_fname}} na malishell in število zapiši v spremenljivko $images na simpleArbiterDhcpGW v lupini, kjer poganjaš task_check.py. + +

+V imeniku {{wc_dirname}} najdeš datoteko count.txt. Preštej število prehodov v novo vrstico v count.txt in rezultat zapiši v novo datoteko lines.txt v istem imeniku. +''', + 'en': '''\ +

+Log into the system as student using vaje as your password. + +

+In your home folder you will find a directory called {{file_rename_dirname}} containing 20 files. Rename all files in that directory replacing all dashes with underscores + +

+Find the shortest command for copying all the files located in {{mv_src_dir}} into the folder {{mv_dst_dir}}. Create a shell script /home/student/mv_ukaz containing this command. Before running test_task.py, make sure {{mv_src_dir}} contains the same files as when you downloaded your virtual disk. This probably means that you will have to move the files back from {{mv_dst_dir}} to {{mv_src_dir}} after each test. + +

+Come up with a command or sequence of commands in bash which will, using grep, write the names all normal (not hidden) files which contain the string mama and are located in the working directory (pwd) into the file ~/mama.txt while writing errors such as files in current directory being folders or symbolic links in the file called napake.txt. Write this command to /home/student/mama_ukaz. + +

+Write a program (which may be a shell script) that will track the contents of /var/log/syslog for five seconds. Every time an entry containing the string zmeda appears in the syslog, the script should output imam ga. In addition, the script should count down from 5 to 1 with a one-second interval. Store the script in /home/student/syslog_ukaz.sh. + +

+Install the package cowsay and test it. 😊 + +

+Using the curl command count the number of occurences of the string images on the web page accessible from malishell at http://localhost/{{curl_fname}}. On simpleArbiterDhcpGW within the shell where you are running test_task.py, set the environment variable $images to this number. + +

+In the directory {{wc_dirname}} there is a file called count.txt. Write the number of newlines in this file into the file lines.txt in the same directory. +''', } computers = { diff --git a/kpov_judge/tasks/custom_rdate/task.py b/kpov_judge/tasks/custom_rdate/task.py index 4959266..4c5ff9f 100644 --- a/kpov_judge/tasks/custom_rdate/task.py +++ b/kpov_judge/tasks/custom_rdate/task.py @@ -2,34 +2,27 @@ # TODO: finish this! instructions = { - 'si':""" -Postavite dva navidezna racunalnika: -- SimpleArbiterDhcpRdate s slike diska simpleArbiterRdate ter -- rdateClient. - -Na rdateClient ustvarite uporabnika test z geslom test. Nastavite cas na -rdateClient tako, da kot rdate strežnik uporabite SimpleArbiterDhcpRdate. -Nato v domacem imeniku uporabnika test ustvarite program z imenom -{PROGRAM_FILENAME}. -Program naj prebere 4 byte podatkov s standardnega vhoda in jih pretvori v -predznaceno celo število, pri čemer naj uporablja zapis z debelim koncem -(big endian). -Število naj program izpiše na standardni izhod v obliki niza. -""", - 'en':""" -Setup two virtual machines: -- SimpleArbiterDhcpRdate from disk image simpleArbiterRdate and -- rdateClient. - -On rdateClient, create a user with the username test and password test. -Set the time on rdateClient using rdate with SimpleArbiterDhcpRdate as -the server. Then, write a program called {PROGRAM_FILENAME} and put it in -user test's home directory. -The program should read 4 bytes of data from standard input, convert -them into a signed integer using big endian byte ordering and output the -resulting integer (as a string) to standard output. -""" - + 'si': '''\ +

+Postavite dva navidezna računalnika: SimpleArbiterDhcpRdate in rdateClient. + +

+Nastavite čas na rdateClient tako, da kot rdate strežnik uporabite SimpleArbiterDhcpRdate. + +

+Na rdateClient ustvarite uporabnika test z geslom test. V domačem imeniku uporabnika test ustvarite program z imenom {{PROGRAM_FILENAME}}. Program naj prebere štiri bajte podatkov s standardnega vhoda in jih pretvori v predznačeno celo število, pri čemer naj uporablja zapis z debelim koncem (angl. big endian). Število naj program izpiše na standardni izhod v obliki niza. +''', + 'en': '''\ +

+Set up two virtual machines: SimpleArbiterDhcpRdate and rdateClient. + +

+Set the time on rdateClient using rdate with SimpleArbiterDhcpRdate as +the server. + +

+On rdateClient create a user with the username test and password test. Then, write a program called {{PROGRAM_FILENAME}} and put it in user test’s home directory. The program should read four bytes of data from standard input, convert them into a signed integer using big endian byte ordering and output the resulting integer (as a string) to standard output. +''', } computers = { diff --git a/kpov_judge/tasks/dhcp_dns_predefined_ip/task.py b/kpov_judge/tasks/dhcp_dns_predefined_ip/task.py index fb0de84..4822c2a 100644 --- a/kpov_judge/tasks/dhcp_dns_predefined_ip/task.py +++ b/kpov_judge/tasks/dhcp_dns_predefined_ip/task.py @@ -2,7 +2,7 @@ instructions = { 'si':""" -Ustvari tri navidezne računalnike. Za enega (SimpleArbiter) uporabi sliko diska simpleArbiter. Na drugega (DHCP_server) postavi strežnika DHCP in DNS in poskrbi, da ta računalnik dobi IP naslov {IP_server}. Poskrbi, da bo preostali računalnik (DHCP_client) dobil naslov {IP_client}, ki mu ga določi DHCP strežnik. Poskrbi še,da DNS strežnik vrne za hostname {HOSTNAME_X} IP naslov {IP_X}. +

Ustvari tri navidezne računalnike. Za enega (SimpleArbiter) uporabi sliko diska simpleArbiter. Na drugega (DHCP_server) postavi strežnika DHCP in DNS in poskrbi, da ta računalnik dobi IP naslov {IP_server}. Poskrbi, da bo preostali računalnik (DHCP_client) dobil naslov {IP_client}, ki mu ga določi DHCP strežnik. Poskrbi še,da DNS strežnik vrne za hostname {HOSTNAME_X} IP naslov {IP_X}.

""" } diff --git a/kpov_judge/tasks/edit_find_grep_compile_convert/task.py b/kpov_judge/tasks/edit_find_grep_compile_convert/task.py index 7a96a0b..48b713b 100644 --- a/kpov_judge/tasks/edit_find_grep_compile_convert/task.py +++ b/kpov_judge/tasks/edit_find_grep_compile_convert/task.py @@ -5,54 +5,43 @@ # - switch to a real SSH/SFTP client to properly handle filenames instructions = { - 'si':""" -Ustvari dva navidezna računalnika s slikama diskov -- SimpleArbiter s sliko diska simpleArbiterDhcp in -SmallStudent s sliko diska student-entrance2. + 'si': '''\ +

+Ustvari dva navidezna računalnika: SimpleArbiter SmallStudent. -Na SimpleArbiter se lahko prijaviš z uporabniškim imenom tester in geslom tester. -Na SmallStudent se lahko prijaviš kot root z geslom kaboom. +

+Poskrbi, da bo SmallStudent s SimpleArbiter dostopen na naslovu {{testip}}. -Poskrbi, da bo SmallStudent s SimpleArbiter dostopen na naslovu {testip}. +

+Na SmallStudent ustvari uporabnika {{testuser}} z geslom {{passwd}}. -Na SmallStudent ustvari uporabnika {testuser} z geslom {passwd}. +

+Na SmallStudent je nekje v domačem imeniku uporabnika bilbo skrita datoteka, ki vsebuje niz {{magicstr}}. Skopiraj jo v domači imenik uporabnika {{testuser}} in jo poimenuj {{dstfile}}. Poskrbi, da bo lastnik {{testuser}}, skupina pa naj bo enaka kot pri izvorni datoteki. Brati naj jo ima pravico samo lastnik, pisati lastnik in skupina, poganjati nihče. -Na SmallStudent je nekje v domačem imeniku uporabnika "bilbo" skrita datoteka, ki vsebuje niz {magicstr}. -Skopiraj jo v domači imenik {testuser} in poimenuj {dstfile}. -Poskrbi, da bo lastnik {testuser}, skupina pa naj ostane nespremenjena. -Brati naj jo ima pravico samo lastnik, pisati lastnik in skupina, poganjati nihče. -V {dstfile} zamenjaj vse vrstice oblike poXYZlz, kjer so XYZ poljubni znaki, tako, da bo namesto XYZ niz "kaka". +

+V {{dstfile}} zamenjaj vse vrstice oblike poXYZlz, kjer je XYZ poljubno zaporedje znakov, tako, da bo namesto XYZ niz kaka. -Napiši program v poljubnem programskem jeziku, ki kot argument sprejme število B med 0 in 7. -Program naj prebere znak s standardnega vhoda. -Če je B-ti bit v znaku nastavljen na 1, naj izpiše "ta". -Če je B-ti bit nastavljen na 0, naj program izpiše "ti". -Program poimenuj {progname} in ga spravi v domači imenik {testuser}. -""", - 'en': ''' -Create two virtual machines -- SimpleArbiter using simpleArbiterDhcp as the disk image and -SmallStudent using student-entrance2 as its disk. +

+Napiši program v poljubnem programskem jeziku, ki kot argument sprejme število B med 0 in 7. Program naj prebere znak s standardnega vhoda Če je B-ti bit v znaku nastavljen na 1, naj izpiše ta. Če je B-ti bit nastavljen na 0, naj program izpiše ti. Program poimenuj {{progname}} in ga spravi v domači imenik uporabnika {{testuser}}. +''', + 'en': '''\ +

+Create two virtual machines: SimpleArbiter and SmallStudent. -You can log in as tester on SimpleArbiter with the password tester. -You can log in as root on SimpleStudent with the password kaboom. +

+Make sure that SmallStudent is accessible from SimpleArbiter on IP {{testip}}. -Make sure that SmallStudent is accessible from SimpleArbiter on IP {testip}. +

+Create a user {{testuser}} with the password {{passwd}} on SmallStudent. -Create a user {testuser} with the password {passwd} on SmallStudent. +

+There is a file containing {{magicstr}} hidden somewhere in the home directory of user bilbo. Copy it into {{testuser}}’s home directory and name it {{dstfile}}. Change the owner to {{testuser}} and ensure the group is the same as for the original file. Make sure only the owner has the right to read it, only the owner and group members have the right to write to it and nobody has the right to execute it. -There is a file containing {magicstr} hidden somewhere in the home directory of -user "bilbo". -Copy the into the home directory of user {testuser} and name it {dstfile}. -Change the owner to {testuser} and leave the group unchanged. -Make sure only the owner has the right to read it, only the owner and group members have the right to write to it and noone has the right to execute it. -In {dstfile}, replace all lines of the form poXYZlz where XYZ are arbitrary characters so that XYZ is replaced by "kaka". +

+In {{dstfile}}, replace all lines of the form poXYZlz where XYZ are arbitrary characters so that XYZ is replaced by kaka. -Write a program in any programming language. -The program should accept a single argument, B, which is a number between 0 and 7. -It should read a character from standard input and output "ta" if B-th bit in this character is -set to 1. If B-th bit is not set, the program should output "ti". -Name the program {progname} and place it in the home directory of {testuser}. +

+Write a program in any programming language. The program should accept a single argument B, which is a number between 0 and 7. It should read a character from standard input and output ta if B-th bit in this character is set to 1, and ti. If B-th bit is set to 0. Name the program {{progname}} and place it in the home directory of {{testuser}}. ''', } diff --git a/kpov_judge/tasks/isc_dhcp_live_boot/task.py b/kpov_judge/tasks/isc_dhcp_live_boot/task.py index 38bbcd8..c1adc47 100644 --- a/kpov_judge/tasks/isc_dhcp_live_boot/task.py +++ b/kpov_judge/tasks/isc_dhcp_live_boot/task.py @@ -2,44 +2,40 @@ # kpov_util should be imported by add_assignment.py instructions = { - 'si':""" -Postavi štiri navidezne računalnike - simpleArbiter, DHCP_server, -BootableClientA ter BootableClientB. - -Na DHCP_server postavi DHCP strežnik s pomočjo ISC dhcp 3 na naslovu {IP_DHCP}. -SimpleArbiter naj dobi {IP_GW}. DHCP_server naj ga uporabi kot gateway. - -Če se zaganja BootableClientB, naj se sistem zažene v datoteko z imenom {BOOT_FNAME}. -Če se zaganja katerikoli drug, naj se sistem zažene z živega USB, ki ga predstavlja -slika diska bootable_usb, ime datoteke z zagonskim nalagalnikom pa naj bo -kakršno koli razen {BOOT_FNAME}. - -Živi USB priklopite na na DHCP_server ter z njega poberite datoteke, potrebne za zagon. -Datoteke z nastavitvami za PXELinux, ki jih najdete na živem USB, -MORAJO biti dostopne na korenskem imeniku strežnika TFTP. - -Tako BootableClientA kot BootableClientB naj bosta brez diskov. -""", - # TODO: write a proper translation. The one that used to be here was just wrong. - 'en': """Set up 4 virtual computers - simpleArbiter, DHCP_server, -BootableClientA and BootableClientB. - -On DHCP_server, set up a DHCP server using ISC dhcp 3. Set the IP address of -this server to {IP_DHCP}. If SimpleArbiter requests an IP, have the DHCP server -serve it {IP_GW}. DHCP_server should use SimpleArbiter as it's gateway. - -If BootableClientB tries to boot over the network, have the DHCP server tell it -to boot from the file {BOOT_FNAME}. If any other system tries to boot over the -network, have it boot from a live USB drive represented by the disk image -bootable_usb and have the bootloader filename be different from {BOOT_FNAME}. - -Connect the live USB to DHCP_server and copy the files neccessarry for it to -boot. The PXELinux configuration files must be the same as the ones found on -the live USB and MUST be accessible on the TFTP server root. - -Both BootableCLientA and BootableClientB should be diskless. -""" + 'si': '''\ +

+Postavi štiri navidezne računalnike: simpleArbiter, DHCP_server, BootableClientA in BootableClientB. + +

+Na DHCP_server postavi strežnik DHCP s pomočjo ISC dhcp 3 na naslovu {{IP_DHCP}}. SimpleArbiter naj dobi {{IP_GW}}. DHCP_server naj ga uporabi kot privzeti prehod (angl. gateway). + +

+Če se zaganja BootableClientB, naj se sistem zažene v datoteko z imenom {{BOOT_FNAME}}. Če se zaganja katerikoli drug, naj se sistem zažene z živega USB, ki ga predstavlja slika diska bootable_usb, ime datoteke z zagonskim nalagalnikom pa naj bo kakršno koli razen {{BOOT_FNAME}}. + +

+Živi USB priklopite na na DHCP_server in z njega poberite datoteke, potrebne za zagon. Datoteke z nastavitvami za PXELinux, ki jih najdete na živem USB, morajo biti dostopne na korenskem imeniku strežnika TFTP. + +

+Tako BootableClientA kot BootableClientB naj bosta brez diskov. +''', + 'en': '''\ +

+Set up four virtual machines: simpleArbiter, DHCP_server, BootableClientA and BootableClientB. + +

+On DHCP_server, set up a DHCP server using ISC dhcp 3. Set the IP address of this server to {{IP_DHCP}}. If SimpleArbiter requests an IP, have the DHCP server serve it {{IP_GW}}. DHCP_server should use SimpleArbiter as the gateway. + +

+If BootableClientB tries to boot over the network, have the DHCP server tell it to boot from the file {{BOOT_FNAME}}. If any other system tries to boot over the network, have it boot from a live USB drive represented by the disk image bootable_usb and have the bootloader filename be different from {{BOOT_FNAME}}. + +

+Connect the live USB to DHCP_server and copy the files neccessarry for it to boot. The PXELinux configuration files must be the same as the ones found on the live USB and must be accessible on the TFTP server root. + +

+Both BootableCLientA and BootableClientB should be diskless. +''', } + computers = { 'DHCPServer': { 'disks': [ @@ -49,10 +45,6 @@ computers = { 'options':{'readonly': False}, 'parts': [ {'dev': 'sdb1', 'path':'/mnt'} ], }, - #{ 'name': 'CDROM', - # 'options':{'readonly': True}, - # 'parts': [],# no parts, no mounting. - #} ], 'network_interfaces': [{'network': 'net1'}], 'flavor': 'm1.tiny', @@ -76,10 +68,6 @@ computers = { 'disks': [ { 'name': 'simpleArbiterGW', }, - #{ 'name': 'CDROM', - # 'options': {'readonly': True}, - # 'parts': [{'dev': 'b1', 'path': '/cdrom'}], - #}, ], 'network_interfaces': [{'network': 'net1'}, {'network': 'test-net'}], 'flavor': 'm1.tiny', @@ -121,8 +109,6 @@ def task(IP_DHCP, IP_GW, MAC_BOOT, BOOT_FNAME): # could work (but you should test it) ip_str = pexpect.run('ip addr show') eth_re_str = r"ether (([0-9a-f]{{2}}:){{5}}[0-9a-f]{{2}})(.*)\r\n(.*){}(.*)\s(\w*)\r\n" - # print eth_re_str.format(IP_DHCP) - # print ip_str ip_re = re.search(eth_re_str.format(IP_GW), ip_str) mac_SA = ip_re.group(1) eth_dev_SA = ip_re.group(6) @@ -162,7 +148,6 @@ def gen_params(user_id, params_meta): params['IP_DHCP'], params['IP_GW'] = kpov_util.IPv4_addr_gen(r, net, 2) params['BOOT_FNAME'] = kpov_util.fname_gen(r) params['TFTP_STRING'] = kpov_util.alnum_gen(r, 45) - # IP_NM, DNS_NM, IP_static, DNS_static) return params def task_check(results, params): @@ -209,7 +194,6 @@ def task_check(results, params): return score, hints def prepare_disks(templates, task_params, global_params): -# d = templates['simpleArbiterDhcp'] d = templates['student-DHCPServer'] s = """# {}""".format(task_params['TFTP_STRING']) d = templates['bootable_usb'] diff --git a/kpov_judge/tasks/ldap_import/task.py b/kpov_judge/tasks/ldap_import/task.py index b46b432..f8fdd60 100644 --- a/kpov_judge/tasks/ldap_import/task.py +++ b/kpov_judge/tasks/ldap_import/task.py @@ -2,14 +2,13 @@ instructions = { 'si':""" -Ustvari dva navidezna računalnika - SimpleArbiter z diskom simpleArbiterDhcp ter LDAPServer. +

Ustvari dva navidezna računalnika - SimpleArbiter z diskom simpleArbiterDhcp ter LDAPServer.
 Na LDAPServer namesti strežnik LDAP. Na SimpleArbiter preberi ime domene DOMENA,
 uporabniško ime BIND_DN ter geslo BIND_PASS. Poskrbi, da se bo lahko klient s simpleArbiterDhcp povezal na LDAP strežnik na LDAPServer.
 V primeru, da se klient poveže kot BIND_DN z geslom BIND_PASS, naj strežnik omogoči branje vseh podatkov za objekte v
 DC=DOMENA,DC=kpov,DC=lusy,DC=fri,DC=uni-lj,DC=si. Nato na LDAP strežniku poišči datoteko /home/test/users.txt. Vsaka vrstica
 v datoteki vsebuje uporabniško ime, ime ter priimek, ločene s tabulatorji. V bazi LDAP
-pod DC=DOMENA,DC=kpov,DC=lusy,DC=fri,DC=uni-lj,DC=si za vsako vrstico v users.txt ustvari svojega uporabnika.
-
+pod DC=DOMENA,DC=kpov,DC=lusy,DC=fri,DC=uni-lj,DC=si za vsako vrstico v users.txt ustvari svojega uporabnika.

""" } diff --git a/kpov_judge/tasks/ldap_search/task.py b/kpov_judge/tasks/ldap_search/task.py index 92a7223..485a2ae 100644 --- a/kpov_judge/tasks/ldap_search/task.py +++ b/kpov_judge/tasks/ldap_search/task.py @@ -5,59 +5,84 @@ # TODO: finish this! instructions = { - 'si':""" -Ustvari dva navidezna računalnika - SimpleArbiter z diskom simpleArbiterDhcp -ter LDAPServer. + 'si': '''\ +

+Ustvari dva navidezna računalnika: SimpleArbiter in LDAPServer. -Na LDAPServer namesti strežnik LDAP. Strežnik naj skrbi za domeno -DC={DOMAIN},DC=kpov,DC=lusy,DC=fri,DC=uni-lj,DC=si +

+Na LDAPServer namesti strežnik LDAP. Strežnik naj skrbi za domeno -V imeniku ustvari uporabnika -CN={LDAP_USERNAME},ou=users,DC={DOMAIN},DC=kpov,DC=lusy,DC=fri,DC=uni-lj,DC=si +

DC={{DOMAIN}},DC=kpov,DC=lusy,DC=fri,DC=uni-lj,DC=si

-z geslom {LDAP_PASSWORD} in uporabnika -CN={BIND_USERNAME},ou=users,DC={DOMAIN},DC=kpov,DC=lusy,DC=fri,DC=uni-lj,DC=si -z geslom {BIND_PASSWORD} +

+V imeniku ustvari uporabnika -Poskrbi, da se bo lahko klient s simpleArbiterDhcp povezal na LDAP strežnik na LDAPServer. -V primeru, da se klient poveže kot {BIND_USERNAME} z geslom {BIND_PASSWORD}, +

CN={{LDAP_USERNAME}},ou=users,DC={{DOMAIN}},DC=kpov,DC=lusy,DC=fri,DC=uni-lj,DC=si

+ +

+z geslom {{LDAP_PASSWORD}} in uporabnika + +

CN={{BIND_USERNAME}},ou=users,DC={{DOMAIN}},DC=kpov,DC=lusy,DC=fri,DC=uni-lj,DC=si

+ +

+z geslom {{BIND_PASSWORD}}. + +

+Poskrbi, da se bo lahko klient s SimpleArbiter povezal na LDAP strežnik na LDAPServer. +V primeru, da se klient poveže kot {{BIND_USERNAME}} z geslom {{BIND_PASSWORD}}, naj strežnik omogoči spreminjanje podatkov za objekt -CN={LDAP_USERNAME},ou=users,DC={DOMAIN},DC=kpov,DC=lusy,DC=fri,DC=uni-lj,DC=si -ter ustvarjanje novih objektov v DC={DOMAIN},DC=kpov,DC=lusy,DC=fri,DC=uni-lj,DC=si + +

CN={{LDAP_USERNAME}},ou=users,DC={{DOMAIN}},DC=kpov,DC=lusy,DC=fri,DC=uni-lj,DC=si

+ +

+ter ustvarjanje novih objektov v + +

DC={{DOMAIN}},DC=kpov,DC=lusy,DC=fri,DC=uni-lj,DC=si
 
 CN = Common Name
 O = Organization
 OU = Organizational Unit
 DC = Domain Component
-""",
-    'en': """
-Create two virtual machines - SimpleArbiter using the disk simpleArbiterDhcp
-and LDAPServer.
+

+''', + 'en': '''\ +

+Create two virtual machines: SimpleArbiter and LDAPServer. -Set up an LDAP server on LDAPServer. Make it responsible for -DC={DOMAIN},DC=kpov,DC=lusy,DC=fri,DC=uni-lj,DC=si +

+Set up an LDAP server on LDAPServer. Make it responsible for +

DC={{DOMAIN}},DC=kpov,DC=lusy,DC=fri,DC=uni-lj,DC=si

+ +

Create a user -CN={LDAP_USERNAME},ou=users,DC={DOMAIN},DC=kpov,DC=lusy,DC=fri,DC=uni-lj,DC=si -with the password {LDAP_PASSWORD} and a user -CN={BIND_USERNAME},ou=users,DC={DOMAIN},DC=kpov,DC=lusy,DC=fri,DC=uni-lj,DC=si +

CN={{LDAP_USERNAME}},ou=users,DC={{DOMAIN}},DC=kpov,DC=lusy,DC=fri,DC=uni-lj,DC=si

+ +

+with the password {{LDAP_PASSWORD}}, and a user + +

CN={{BIND_USERNAME}},ou=users,DC={{DOMAIN}},DC=kpov,DC=lusy,DC=fri,DC=uni-lj,DC=si

-with the password {LDAP_PASSWORD} . +

+with the password {{LDAP_PASSWORD}} . -Make sure that a client from simpleArbiterDhcp can connect to the LDAP server on -LDAPServer. If the client identifies themself as {BIND_USERNAME} with the password -{BIND_PASSWORD}, allow it to change data for the object +

+Make sure that a client from SimpleArbiter can connect to the LDAP server on LDAPServer. If the client identifies themself as {{BIND_USERNAME}} with the password {{BIND_PASSWORD}}, allow it to change data for the object -CN={LDAP_USERNAME},ou=users,DC={DOMAIN},DC=kpov,DC=lusy,DC=fri,DC=uni-lj,DC=si -and to create objects in DC={DOMAIN},DC=kpov,DC=lusy,DC=fri,DC=uni-lj,DC=si +

CN={{LDAP_USERNAME}},ou=users,DC={{DOMAIN}},DC=kpov,DC=lusy,DC=fri,DC=uni-lj,DC=si

+ +

+and to create objects in + +

DC={{DOMAIN}},DC=kpov,DC=lusy,DC=fri,DC=uni-lj,DC=si
 
 CN = Common Name
 O = Organization
 OU = Organizational Unit
 DC = Domain Component
-
-"""
+

+''', } computers = { diff --git a/kpov_judge/tasks/mock_entrance_exam/task.py b/kpov_judge/tasks/mock_entrance_exam/task.py index 906df97..84dff82 100644 --- a/kpov_judge/tasks/mock_entrance_exam/task.py +++ b/kpov_judge/tasks/mock_entrance_exam/task.py @@ -5,45 +5,50 @@ # - switch to a real SSH/SFTP client to properly handle filenames instructions = { - 'si': ''' -Postavite dva navidezna računalnika - SimpleArbiter in Student. -Oba naj bosta povezana na internet. Poleg tega mora biti -Student na naslovu {student_IP} dostopen s SimpleArbiter. + 'si': '''\ +

+Postavite dva navidezna računalnika - SimpleArbiter in Student. Oba naj bosta povezana na internet. Poleg tega mora biti Student na naslovu {{student_IP}} dostopen s SimpleArbiter. -Računajte, da se na Student ob zagonu zažene program {net_prog_name}, -ki vam spreminja nastavitve mrežne kartice. +

+Računajte, da se na Student ob zagonu zažene program {{net_prog_name}}, ki vam spreminja nastavitve mrežne kartice. -V domačem imeniku uporabnika student obstaja program {P_c} v programskem jeziku C. -Prevedite ga v program z imenom {P_executable}. -Izvorna koda je namenoma pokvarjena tako, da so vanjo vrinjeni nepotrebni znaki. -Pred prevajanjem jo morate popraviti. +

+V domačem imeniku uporabnika student obstaja program {{P_c}} v programskem jeziku C. +Prevedite ga v program z imenom {{P_executable}}. Izvorna koda je namenoma pokvarjena tako, da so vanjo vrinjeni nepotrebni znaki. Pred prevajanjem jo morate popraviti. -Napišite skripto ali program {P_script} v domačem imeniku uporabnika student, ki: -- požene {P_executable} z argumentom "{arg_c}" in mu na standardni vhod pripelje vrednost spremenljivke {env_c} -- vse, kar {P_executable} izpiše na stderr, spravi v datoteko {out_stderr_c}. -- vse vrstice, ki jih {P_executable} izpiše na stdout in vsebujejo zaporedje znakov "ma", zapiše v {out_stdout_c}. +

+Napišite skripto ali program {{P_script}} v domačem imeniku uporabnika student, ki: -Lastnik vseh ustvarjenih datotek mora biti uporabnik student. -Gesla uporabnika student (vaje) ne smete spreminjati.''', - 'en': '''Set up two virtual machines - SimpleArbiter and Student. -Both should be connected to the Internet. Student should also be accessible -from SimpleArbiter at the address {student_IP}. +

požene {{P_executable}} z argumentom "{{arg_c}}" in mu na standardni vhod pripelje vrednost spremenljivke {{env_c}}; +
vse, kar {{P_executable}} izpiše na stderr, spravi v datoteko {{out_stderr_c}}; in +
vse vrstice, ki jih {{P_executable}} izpiše na stdout in vsebujejo zaporedje znakov ma, zapiše v {{out_stdout_c}}. +

-Keep in mind that a program called {net_prog_name} starts on Student -whenever Student boots. This program may change your network settings. +

+Lastnik vseh ustvarjenih datotek mora biti uporabnik student. Gesla uporabnika student (vaje) ne smete spreminjati. +''', + 'en': '''\ +

+Set up two virtual machines - SimpleArbiter and Student. Both should be connected to the internet. Student should also be accessible from SimpleArbiter at the address {{student_IP}}. + +

+Keep in mind that a program called {{net_prog_name}} starts on Student on each boot. This program may change your network settings. + +

+There is a program called {{P_c}} in student’s home directory. Compile it into a program called {{P_executable}}. The source code is intentionally broken so that unneccessarry characters are inserted into the file. You have to fix the file before compiling. -There is a program called {P_c} in the home directory of student. Compile it -into a program called {P_executable}. The source code is intentionally broken -so that unneccessarry characters are inserted into the file. You have to fix -the file before compiling. +

+Also, write a script or program called {{P_script}} in student’s home directory. The script should: -Also, write a script or program called {P_script} in the home directory of student. -The script should: -- run {P_executable} with the argument {arg_c} and pipe the value of the environment variable {env_c} into {P_executable}'s standard input. -- redirect stderr of {P_executable} into a file called {out_stderr_c}. -- save each line which {P_executable} outputs and which contains the character sequence "ma" into {out_stdout_c}. +

run {{P_executable}} with the argument {{arg_c}} and pipe the value of the environment variable {{env_c}} into {{P_executable}}’s standard input; +
redirect stderr of {{P_executable}} into a file called {{out_stderr_c}}; and +
save each line which {{P_executable}} outputs and which contains the character sequence ma into {{out_stdout_c}}. +

-The owner of all created files should be student. You are not allowed to change student's password (vaje). +

+The owner of all created files should be student. You are not allowed to change student’s password (vaje). ''', } diff --git a/kpov_judge/tasks/nat_port_forward/task.py b/kpov_judge/tasks/nat_port_forward/task.py index 8fe28d7..80d2e47 100644 --- a/kpov_judge/tasks/nat_port_forward/task.py +++ b/kpov_judge/tasks/nat_port_forward/task.py @@ -2,13 +2,12 @@ instructions = { 'si':""" -Postavi tri računalnike - SimpleArbiter z diska simpleArbiter, TestClient z diska testClient in NATServer. NATServer naj ima dva omrežna vmesnika - z enim naj bo +

Postavi tri računalnike - SimpleArbiter z diska simpleArbiter, TestClient z diska testClient in NATServer. NATServer naj ima dva omrežna vmesnika - z enim naj bo
 povezan na omrežje, od koder bo imel dostop do Interneta, z drugim pa na SimpleArbiter. TestClient naj bo povezan na isto omrežje z dostopom do Interneta kot NATServer.
 Poskrbi, da bo NATServer služil kot DHCP strežnik ter privzeti prehod za SimpleArbiter.
 Na SimpleArbiter preberi vrednosti NET, PORT_OUTER in PORT_INNER ter vpiši IP_TEST_CLIENT. Poskrbi, da
 bo omrežje med SimpleArbiter in NATServer na področju NET. Nato poskrbi, da se
-bo TCP promet z omrežja z dostopom do Interneta na vrata PORT_OUTER prepošiljal na SimpleArbiter na vrata PORT_INNER.
-"""
+bo TCP promet z omrežja z dostopom do Interneta na vrata PORT_OUTER prepošiljal na SimpleArbiter na vrata PORT_INNER.

""" } computers = { diff --git a/kpov_judge/tasks/nat_vlc/task.py b/kpov_judge/tasks/nat_vlc/task.py index ffcb6c1..5224495 100644 --- a/kpov_judge/tasks/nat_vlc/task.py +++ b/kpov_judge/tasks/nat_vlc/task.py @@ -7,29 +7,29 @@ #TODO: finish this instructions = { - 'si':""" -Postavi dva navidezna računalnika - SimpleArbiter z diskom simpleArbiter -ter NATServer. NATServer naj ima dva omrežna vmesnika - z enim naj bo povezan -na lokalno omrežje, na katerem naj bo tudi simpleArbiter, z drugim pa na -Internet. Na NATServer skonfiguriraj omrežne vmesnike tako, da bo imel dostop -do Interneta in da bo imel na lokalnem omrežju {IP_NAT}. Na NATServer -ustvarite še uporabnika {IP_NAT_user}. - -Poskrbi, da bo SimpleArbiter prek DHCP dobil naslov {IP_simple}. -Poskrbi, da bo NATServer deloval kot prehod za SimpleArbiter in izvajal NAT. -""", - 'en':""" -Set up two virtual machines - SimpleArbiter (using the disc simpleArbiter) and -NATServer. NATServer should have two network adapters. Connect the first -adapter to SimpleArbiter and the second adapter to the Internet. Configure the -network in NATServer so that one interface is connected to the Internet while -the other is connected to SimpleArbiter and has the address {IP_NAT}. Create -a user called {IP_NAT_user} on NATServer. - -Configure a DHCP server on NATServer so that SimpleArbiter gets the IP -{IP_simple}. Also, set up NAT on NATServer and set it as the gateway for -SimpleArbiter. -""" + 'si': '''\ +

+Postavi dva navidezna računalnika: SimpleArbiter in NATServer. NATServer naj ima dva omrežna vmesnika - z enim naj bo povezan na lokalno omrežje, na katerem naj bo tudi simpleArbiter, z drugim pa na Internet. + +

+Na NATServer skonfiguriraj omrežne vmesnike tako, da bo imel dostop do Interneta in da bo imel na lokalnem omrežju {{IP_NAT}}. Na NATServer ustvarite še uporabnika {{IP_NAT_user}}. + +

+Poskrbi, da bo SimpleArbiter prek DHCP dobil naslov {{IP_simple}}. Poskrbi, da bo NATServer deloval kot prehod za SimpleArbiter in izvajal NAT. +''', + 'en': '''\ +

+Set up two virtual machines: SimpleArbiter and +NATServer. NATServer should have two network +adapters. Connect the first adapter to SimpleArbiter and the +second adapter to the Internet. + +

+Configure the network in NATServer so that one interface is connected to the Internet while the other is connected to SimpleArbiter and has the address {{IP_NAT}}. Create a user called {{IP_NAT_user}} on NATServer. + +

+Configure a DHCP server on NATServer so that SimpleArbiter gets the IP {{IP_simple}}. Also, set up NAT on NATServer and set it as the gateway for SimpleArbiter. +''', } computers = { diff --git a/kpov_judge/tasks/network_boot_custom_program/task.py b/kpov_judge/tasks/network_boot_custom_program/task.py index e81939f..e3fbad2 100644 --- a/kpov_judge/tasks/network_boot_custom_program/task.py +++ b/kpov_judge/tasks/network_boot_custom_program/task.py @@ -2,12 +2,12 @@ instructions = { 'si':""" -Postavi tri navidezne računalnike - simpleArbiter, DHCP_server, DHCP_client. +

Postavi tri navidezne računalnike - simpleArbiter, DHCP_server, DHCP_client.
 Na računalniku DHCP_server najdeš program A. DHCP_server nastavi tako, da se bo
 DHCP_client lahko zagnal prek mreže. Na datotečni sistem, s katerega
 se zaganja DHCP_client, spravi program A. Poskrbi, da se A požene ob zagonu DHCP_client.
 
-DHCP_client ne sme imeti priklopljenega nobenega trdega diska.
+DHCP_client ne sme imeti priklopljenega nobenega trdega diska.

""" } diff --git a/kpov_judge/tasks/openvpn_multiple_hops/task.py b/kpov_judge/tasks/openvpn_multiple_hops/task.py index 230393d..44ad8c4 100644 --- a/kpov_judge/tasks/openvpn_multiple_hops/task.py +++ b/kpov_judge/tasks/openvpn_multiple_hops/task.py @@ -2,13 +2,13 @@ instructions = { 'si':""" -Postavi 4 navidezne računalnike - SimpleArbiter z diska simpleArbiterDhcp, A, B ter C. +

Postavi 4 navidezne računalnike - SimpleArbiter z diska simpleArbiterDhcp, A, B ter C.
 Na računalnikih A, B in C ustvari uporabnika test z geslom test.
 Poskrbi, da bodo vsi štirje na istem navideznem fizičnem omrežju. Naslov omrežja (NET_PHYS) ter naslove
 (IP_A, IP_B, IP_C) preberi na SimpleArbiter. S pomočjo OpenVPN postavi navidezno omrežje med A in B na naslovih NET_VPN1. 
 Nato s pomočjo OpenVPN postavi še navidezno omrežje med B in C na naslovih NET_VPN2.
 Poskrbi, da bo promet z A prek VPN prišel do C in obratno. Za avtentikacijo uporabi skupne skrivnosti, ki
-jih prebereš na SimpleArbiter - med A in B SECRET_AB ter med B in C SECRET_BC.
+jih prebereš na SimpleArbiter - med A in B SECRET_AB ter med B in C SECRET_BC.

""" } 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 = { diff --git a/kpov_judge/tasks/openwrt/task.py b/kpov_judge/tasks/openwrt/task.py index ed2783a..8872989 100644 --- a/kpov_judge/tasks/openwrt/task.py +++ b/kpov_judge/tasks/openwrt/task.py @@ -2,11 +2,11 @@ instructions = { 'si':""" -Postavi dva navidezna računalnika - simpleArbiter z diska SimpleArbiter ter +

Postavi dva navidezna računalnika - simpleArbiter z diska SimpleArbiter ter
 OpenWRT z diska OpenWRT. Na disku OpenWRT je nameščena distribucija OpenWRT.
 Nastavi OpenWRT tako, da bo imel dva omrežna vmesnika - en naj bo povezan na Internet,
 drugo na omrežje, na katerem bo SimpleArbiter. Na SimpleArbiter preberi naslov omrežja
-med OpenWrt in SimpleArbiter ter njuna naslova.  
+med OpenWrt in SimpleArbiter ter njuna naslova.

""" } diff --git a/kpov_judge/tasks/public_ip_ssh/task.py b/kpov_judge/tasks/public_ip_ssh/task.py index 561a1fa..8dcb858 100644 --- a/kpov_judge/tasks/public_ip_ssh/task.py +++ b/kpov_judge/tasks/public_ip_ssh/task.py @@ -2,10 +2,10 @@ instructions = { 'si':""" -Ustvari dva navidezna računalnika. Za disk enega (imenujmo ga SimpleArbiter) uporabite +

Ustvari dva navidezna računalnika. Za disk enega (imenujmo ga SimpleArbiter) uporabite
 sliko diska Test. Na drugega (imenujmo ga A) namesti poljubno Linux distribucijo. Na SimpleArbiter
 preberi uporabniško ime in geslo uporabnika, ki ga moraš ustvariti na A. Poskrbi, da se bo novoustvarjeni
-uporabnik s svojim geslom lahko na A prijavil z Interneta. 
+uporabnik s svojim geslom lahko na A prijavil z Interneta.

""" } diff --git a/kpov_judge/tasks/public_ssh_motd_http/task.py b/kpov_judge/tasks/public_ssh_motd_http/task.py index 227425a..bd48d77 100644 --- a/kpov_judge/tasks/public_ssh_motd_http/task.py +++ b/kpov_judge/tasks/public_ssh_motd_http/task.py @@ -2,11 +2,11 @@ instructions = { 'si':""" -Na internet postavi računalnik, ki bo dostopen prek ssh in http. +

Na internet postavi računalnik, ki bo dostopen prek ssh in http.
 Poskrbi, da bo na računalniku ustvarjen uporabnik test z geslom test. Ob prijavi naj se
 uporabniku v MOTD izpiše (le) zgodbica ali pesmica, ki vam je všeč, dolžine vsaj 50 znakov.
 Ista zgodbica ali pesmica naj se na strežniku izpiše, če se na strežnik kdorkoli poveže prek
-http.
+http.

""" } diff --git a/kpov_judge/tasks/radius_multiple_realms/task.py b/kpov_judge/tasks/radius_multiple_realms/task.py index 773a3f2..0067f46 100644 --- a/kpov_judge/tasks/radius_multiple_realms/task.py +++ b/kpov_judge/tasks/radius_multiple_realms/task.py @@ -2,7 +2,7 @@ instructions = { 'si':""" -Postavi tri navidezne računalnike - SimpleArbiter z diska simpleArbiterDhcp, +

Postavi tri navidezne računalnike - SimpleArbiter z diska simpleArbiterDhcp,
 RadiusA ter RadiusB. Na simpleArbiterDhcp preberi imeni domen DOMENA_A ter DOMENA_B,
 uporabniški imeni USER_A in USER_B, gesli PASSWORD_A in PASSWORD_B ter skrivnosti
 SECRET_A in SECRET_B. Poskrbi, da se bo lahko radius klient s SimpleArbiter povezal
@@ -12,7 +12,7 @@ na RadiusB uporabnik USER_B z geslom PASSWORD_B.
 
 Poskrbi, da bo strežnik RadiusA odgovarjal na zahtevke za avtentikacijo uporabnikov na domeni DOMENA_A,
 zahtevke za uporabnike na domeni DOMENA_B pa bo preposlal naprej na RadiusB. RadiusB naj odgovarja na
-zahtevke za uporabnike na domeni DOMENA_B, zahtevke za uporabnike na DOMENA_A pa naj preprosto zavrže.
+zahtevke za uporabnike na domeni DOMENA_B, zahtevke za uporabnike na DOMENA_A pa naj preprosto zavrže.

""" } diff --git a/kpov_judge/tasks/radius_mysql_pam/task.py b/kpov_judge/tasks/radius_mysql_pam/task.py index 72b5a74..5051bb4 100644 --- a/kpov_judge/tasks/radius_mysql_pam/task.py +++ b/kpov_judge/tasks/radius_mysql_pam/task.py @@ -1,52 +1,47 @@ # kpov_util should be imported by add_assignment.py instructions = { - 'si':""" -Ustvari dva navidezna računalnika - SimpleArbiter z diska simpleArbiterDhcp ter -RadiusServer. Na RadiusServer namesti FreeRadius ter MySQL. + 'si': '''\ +

+Ustvari dva navidezna računalnika: SimpleArbiter in RadiusServer. Na RadiusServer namesti FreeRadius ter MySQL. -Ustvari mysql podatkovno bazo z imenom {MYSQL_DB_NAME}. Ustvari mysql -uporabnika z imenom {MYSQL_ADMIN_USER} in geslom {MYSQL_ADMIN_PASSWORD}, -ki naj ima poln dostop do te baze. Prijava za tega uporabnika mora biti -omogočena tudi s SimpleArbiter. +

+Ustvari podatkovno bazo MySQL z imenom {{MYSQL_DB_NAME}}. Ustvari uporabnika za MySQL z imenom {{MYSQL_ADMIN_USER}} in geslom {{MYSQL_ADMIN_PASSWORD}}, ki naj ima poln dostop do te baze. Prijava za tega uporabnika mora biti omogočena tudi s SimpleArbiter. -Nastavi FreeRadius tako, da bo podatke o uporabnikih in geslih pobiral iz baze -MySQL z imenom {MYSQL_DB_NAME}. Podatkovna shema (imena tabel) naj ostane +

+Nastavi FreeRadius tako, da bo podatke o uporabnikih in geslih pobiral iz baze MySQL z imenom {{MYSQL_DB_NAME}}. Podatkovna shema (imena tabel) naj ostane privzeta. -Dostop do strežnika Radius na RadiusServer s SimpleArbiter naj bo mogoč ob -uporabi skrivnosti {RADIUS_SECRET}. +

+Dostop do strežnika Radius na RadiusServer s SimpleArbiter naj bo mogoč ob uporabi skrivnosti {{RADIUS_SECRET}}. -V bazi ustvari vnos, ki bo omogočil, da se na RadiusServer s pomočjo protokola -Radius avtenticira uporabnik {RADIUS_USERNAME} z geslom {RADIUS_PASSWORD}. +

+V bazi ustvari vnos, ki bo omogočil, da se na RadiusServer s pomočjo protokola Radius avtenticira uporabnik {{RADIUS_USERNAME}} z geslom {{RADIUS_PASSWORD}}. -Nastavi PAM za prijavo (login) tako, da bo dovolj, če se uporabnik na ssh -predstavi z uporabniškim imenom in geslom, ki sta veljavna na FreeRadius, -ne glede na /etc/shadow oziroma /etc/password. -""", - 'en':""" -Create two virtual machines - SimpleArbiter using the disk simpleArbiterDhcp -and RadiusServer. On RadiusServer, install FreeRadius and MySQL. +

+Nastavi PAM za prijavo (login) tako, da bo dovolj, če se uporabnik na SSH predstavi z uporabniškim imenom in geslom, ki sta veljavna na FreeRadius, ne glede na /etc/shadow oziroma /etc/password. +''', + 'en': '''\ +

+Create two virtual machines: SimpleArbiter and RadiusServer. On RadiusServer, install FreeRadius and MySQL. -Create a mysql database named {MYSQL_DB_NAME}. Create a mysql user with the -username {MYSQL_ADMIN_USER} and password {MYSQL_ADMIN_PASSWORD}. Make sure -this user can access the database from SimpleArbiter and has administrative -rights over the {MYSQL_DB_NAME} database. +

+Create a MySQL database named {{MYSQL_DB_NAME}}. Create a mysql user with the username {{MYSQL_ADMIN_USER}} and password {{MYSQL_ADMIN_PASSWORD}}. Make sure this user can access the database from SimpleArbiter and has administrative rights over the {{MYSQL_DB_NAME}} database. -Set up FreeRadius so that the data about users and passwords is stored in the -MySQL database. Keep the default schema (table names). +

+Set up FreeRadius so that the data about users and passwords is stored in the MySQL database. Keep the default schema (table names). -Make the Radius server on RadiusServer accessible from SimpleArbiter using -{RADIUS_SECRET} as the secret. +

+Make the Radius server on RadiusServer accessible from SimpleArbiter using {{RADIUS_SECRET}} as the secret. -Create an entry in the database which will enable a user with the username -{RADIUS_USERNAME} to authenticate themself against the Radius server using -the password {RADIUS_PASSWORD}. +

+Create an entry in the database which will enable a user with the username {{RADIUS_USERNAME}} to authenticate themself against the Radius server using the password {{RADIUS_PASSWORD}}. -Set up PAM to enable login over ssh using a username and password which are -valida on the FreeRadius server, regardless of the entries in /etc/shadow -and/or /etc/password. -""" +

+Set up PAM to enable login over SSH using a username and password which are +valida on the FreeRadius server, regardless of the entries in /etc/shadow +and/or /etc/password. +''', } #KABOOM diff --git a/kpov_judge/tasks/rdate_64bit/task.py b/kpov_judge/tasks/rdate_64bit/task.py index b08cddc..9f90014 100644 --- a/kpov_judge/tasks/rdate_64bit/task.py +++ b/kpov_judge/tasks/rdate_64bit/task.py @@ -2,12 +2,12 @@ instructions = { 'si':""" -Postavi dva navidezna računalnika - SimpleArbiter z diska simpleArbiterDhcp ter +

Postavi dva navidezna računalnika - SimpleArbiter z diska simpleArbiterDhcp ter
 RdateServer. Na RdateServer postavi strežnik, ki bo poslušal na vratih VRATA_X.
 Vsakič, ko se na vrata poveže klient, naj strežnik pošlje število sekund od DATUM_X.
 Število naj bo kodirano kot 64-bitno predznačeno število s tankim koncem.
 
-VRATA_X in DATUM_X preberi na SimpleArbiter.
+VRATA_X in DATUM_X preberi na SimpleArbiter.

""" } diff --git a/kpov_judge/tasks/rename_grep_network/task.py b/kpov_judge/tasks/rename_grep_network/task.py index 4f8f1ad..4d81313 100644 --- a/kpov_judge/tasks/rename_grep_network/task.py +++ b/kpov_judge/tasks/rename_grep_network/task.py @@ -6,7 +6,7 @@ instructions = { 'si': """ -Ustvari dva navidezna računalnika s slikama diskov +

Ustvari dva navidezna računalnika s slikama diskov 
 - SimpleArbiterExam s sliko diska simpleArbiterDhcp in
 SmallStudent s slikama diska student-entrance3
 in smallstudent-personal.
@@ -26,7 +26,7 @@ Skopiraj jo v domači imenik {testuser} in preimenuj tako, da vse znake 'O' v im
 Pazi, da nobena druga datoteka v domačem imeniku v svojem imenu ne bo vsebovala "I".
 
 Poskrbi, da bo lastnik {testuser}, skupina pa naj ostane nespremenjena.
-Brati naj jo ima pravico samo lastnik, pisati lastnik in skupina, poganjati nihče.
+Brati naj jo ima pravico samo lastnik, pisati lastnik in skupina, poganjati nihče.

""", 'en': ''' ''', diff --git a/kpov_judge/tasks/set_ip_dhcp_hostname/task.py b/kpov_judge/tasks/set_ip_dhcp_hostname/task.py index 77648e6..1007424 100644 --- a/kpov_judge/tasks/set_ip_dhcp_hostname/task.py +++ b/kpov_judge/tasks/set_ip_dhcp_hostname/task.py @@ -2,14 +2,14 @@ instructions = { 'si':""" -Ustvari tri navidezne računalnike. Za disk prvega uporabi sliko diska simpleArbiterDhcp. +

Ustvari tri navidezne računalnike. Za disk prvega uporabi sliko diska simpleArbiterDhcp.
 Za enega od ostalih dveh (Z_DHCP) poskrbi, da bo dobil IP prek DHCP, pri čemer
 naj kot hostname strežniku pošlje ime, ki ga dobiš na simpleArbiterDhcp. 
 Za drugega (BREZ_DHCP) poskrbi, da bo imel statično nastavljen IP.
 
 Prvi omrežni vmesnik računalnika SimpleArbiter naj bo povezan na Internet. Drugi naj bo povezan na neko lokalno omrežje, na katerega bosta priklopljena računalnika Z_DHCP ter BREZ_DHCP. Na računalniku Z_DHCP poskrbite, da bo ob pridobivanju naslova DHCP strežniku poslal tudi posebej nastavljeno ime računalnika (hostname), ki ne bo enako dejanskemu imenu računalnika (tistemu, ki ga izpiše ukaz hostname).
 
-Naslov BREZ_DHCP ter ime računalnika za Z_DHCP dobite ob zagonu run_test.py na računalniku SimpleArbiter.
+Naslov BREZ_DHCP ter ime računalnika za Z_DHCP dobite ob zagonu run_test.py na računalniku SimpleArbiter.

""" } diff --git a/kpov_judge/tasks/set_ip_static_dhcp/task.py b/kpov_judge/tasks/set_ip_static_dhcp/task.py index aac93f7..0d11f43 100644 --- a/kpov_judge/tasks/set_ip_static_dhcp/task.py +++ b/kpov_judge/tasks/set_ip_static_dhcp/task.py @@ -1,30 +1,30 @@ # kpov_util should be imported by add_assignment.py instructions = { - 'si':""" -Ustvari tri navidezne racunalnike. Za prvega -uporabi sliko diska simpleArbiterDhcpGW, za drugega sliko diska -maliNetworkManager, za tretjega sliko diska maliBrezNetworkManager. -Racunalnike imenujmo enako kot slike diska. -Na maliBrezNetworkManager poskrbi, da networkmanager ne bo več skrbel -za omrežni vmesnik, temveč bosta delovala ukaza ifup in ifdown. - -Na maliNetworkManager nastavi IP naslov {IP_NM} ter DNS {DNS_NM}. -Na maliBrezNetworkManager nastavi IP naslov {IP_static} ter DNS {DNS_static}. -""", - 'en':"""Create three virtual machines. Use simpleArbiterDhcpGW as the -disk image for the first, maliNetworkManager as the disk image for the second -and maliBrezNetworkManager for the third. The virtual machine names can match -the disks. - -Make sure that on maliBrezNetworkManager ifup/ifdown can be used to configure -the network and that NetworkManager, while still installed, will not manage -the network interface. The IP should be {IP_static} and the computer should -use the server {DNS_static} as it's DNS. - -On maliNetworkManager, set the IP address to {IP_NM} and use {DNS_NM} -as the DNS. -""" + 'si': '''\ +

+Ustvari tri navidezne računalnike. Za prvega uporabi sliko diska simpleArbiterDhcpGW, za drugega sliko diska +maliNetworkManager, za tretjega sliko diska maliBrezNetworkManager. Računalnike imenujmo enako kot slike diska. + +

+Na maliBrezNetworkManager poskrbi, da NetworkManager ne bo več skrbel za omrežni vmesnik, temveč bosta delovala ukaza ifup in ifdown. + +

+Na maliNetworkManager nastavi naslov IP {{IP_NM}} ter DNS {{DNS_NM}}. + +

+Na maliBrezNetworkManager nastavi naslov IP {{IP_static}} ter DNS {{DNS_static}}. +''', + 'en': '''\ +

+Create three virtual machines. Use simpleArbiterDhcpGW as the disk image for the first, maliNetworkManager as the disk image for the second, and maliBrezNetworkManager for the third. The virtual machine names can match the disks. + +

+Make sure that on maliBrezNetworkManager ifup and ifdown can be used to configure the network and that NetworkManager, while still installed, will not manage the network interface. The IP should be {{IP_static}} and the computer should use the server {{DNS_static}} for DNS. + +

+On maliNetworkManager, set the IP address to {{IP_NM}} and use {{DNS_NM}} for DNS. +''', } computers = { diff --git a/kpov_judge/tasks/set_motd/task.py b/kpov_judge/tasks/set_motd/task.py index f2b65fb..ea5d686 100644 --- a/kpov_judge/tasks/set_motd/task.py +++ b/kpov_judge/tasks/set_motd/task.py @@ -1,41 +1,40 @@ # kpov_util should be imported by add_assignment.py instructions = { - "si":""" -Ustvari dva navidezna računalnika - imenujmo ju SimpleArbiterDhcpGW in -Student. Za računalnik SimpleArbiterDhcpGW uporabite sliko diska, poimenovano -SimpleArbiterDhcpGW. + 'si': '''\ +

+Ustvari dva navidezna računalnika - imenujmo ju SimpleArbiterDhcpGW in Student. +Na računalniku Student ustvarite uporabnika z uporabniškim imenom {{peer_user}}. IP navideznega računalnika Student ter geslo za uporabnika {{peer_user}} nastavite sami. -Na računalniku Student ustvarite uporabnika z uporabniškim imenom {peer_user}. +

+Poskrbite, da se bo v sporočilu, ki se ob prijavi izpiše na računalniku Student, pojavil niz -Poskrbite, da se bo v sporočilu, ki se ob prijavi izpiše na računalniku -Student, pojavil niz "{niz}". Temu sporočilu v angleščini rečemo -"message of the day" - MOTD. +

{{niz}}

-IP navideznega računalnika Student ter geslo za {peer_user} nastavite sami. +

+Temu sporočilu v angleščini rečemo message of the day oziroma MOTD. Ocenjevalni program pričakuje, da se bo ob koncu prijave pojavila ukazna vrstica oblike -Ocenjevalni program pričakuje, da se bo ob koncu prijave pojavila ukazna -vrstica oblike uporabnisko_ime@ime_racunalnika:~$ . +

username@hostname:~$

-Pazite, da se bo takšna vrstica pojavila šele po nizu, ki ste ga dobili v -teh navodilih. - """, - 'en':""" -Create two virtual machines - named SimpleArbiterDhcpGW and Student. -For the 'SimpleArbiterDhcpGW', use disc image named SimpleArbiterDhcpGW. +Pazite, da se bo takšna vrstica pojavila šele po nizu, ki ste ga dobili v teh navodilih. + ''', + 'en': '''\ +

+Create two virtual machines named SimpleArbiterDhcpGW and Student. On Student, create a user with the username {{peer_user}}. Set the IP of Student and the password for {{peer_user}} yourself. -On Student, create a user with the username {peer_user}. +

+Set the message of the day (MOTD) on Student to -Set the message of the day (MOTD) on Student to "{niz}". This is the message -which is displayed when you log in. +

{{niz}}

-Set the IP of Student and the password for {peer_user} yourself. +

+This is the message which is displayed when you log in. The grading system expects that after login a prompt similar to -The grading system expects that at the end of login, -a prompt similar to username@name_of_computer:~$ appears. -Make sure that this line shows up only after the -string you got in these instructions. -""" +

username@hostname:~$

+ +

+appears. Make sure that this line shows up only after the string you got in these instructions. +''' } computers = { diff --git a/kpov_judge/tasks/smb_nfs/task.py b/kpov_judge/tasks/smb_nfs/task.py index a94d677..6d1e51d 100644 --- a/kpov_judge/tasks/smb_nfs/task.py +++ b/kpov_judge/tasks/smb_nfs/task.py @@ -2,24 +2,26 @@ # TODO: dokoncaj! instructions = { - 'si':""" -Postavi dva navidezna računalnika (simpleArbiterDhcp in FileServer). + 'si': '''\ +

+Postavi dva navidezna računalnika: simpleArbiterDhcp in FileServer. -Poskrbi, da bo imenik {NFS_MOUNT} na FileServer dostopen prek NFS in -prek SMB kot imenik v skupni rabi {SMB_SHARENAME}. -Ime SMB strežnika nastavite na {FILESERVER_NAME}. +

+Poskrbi, da bo imenik {{NFS_MOUNT}} na FileServer dostopen prek NFS in prek SMB kot imenik v skupni rabi {{SMB_SHARENAME}}. Ime strežnika SMB nastavite na {{FILESERVER_NAME}}. -SimpleArbiterDhcp naj ima prek NFS pravico pisati po imeniku. -""", -'en':""" -Set up two virtual computers (simpleArbiterDhcp and FileServer). +

+SimpleArbiterDhcp naj ima prek NFS pravico pisati po imeniku. +''', + 'en': '''\ +

+Set up two virtual computers: simpleArbiterDhcp and FileServer. -Make sure that the directory {NFS_MOUNT} on FileServer is accessible -over NFS and over SMB under the sharename {SMB_SHARENAME}. -Set the SMB server name to {FILESERVER_NAME}. +

+Make sure that the directory {{NFS_MOUNT}} on FileServer is accessible over NFS and over SMB under the sharename {{SMB_SHARENAME}}. Set the SMB server name to {{FILESERVER_NAME}}. -SimpleArbiterDhcp should have write access to {NFS_MOUNT} over NFS. -""" +

+SimpleArbiterDhcp should have write access to {{NFS_MOUNT}} over NFS. +''', } computers = { diff --git a/kpov_judge/tasks/snmp_agent_uptime/task.py b/kpov_judge/tasks/snmp_agent_uptime/task.py index 7b3143c..919fcb4 100644 --- a/kpov_judge/tasks/snmp_agent_uptime/task.py +++ b/kpov_judge/tasks/snmp_agent_uptime/task.py @@ -2,44 +2,49 @@ # TODO: finish this. instructions = { - 'si':""" -Naloga: Postavi tri navidezne racunalnike: -- SimpleArbiter s sliko diska simpleArbiterDhcpGW, -- SNMPServer in -- SNMPClient. -Napiši program upminutes, ki bo izpisal v minutah koliko casa je racunalnik -vklopljen. - -Postavi ga na SNMPClient v domaci imenik uporabnika test z geslom test. - -Poskrbi, da bo SNMP strežnik prek SNMP pod -OID {SNMP_UPTIME_OID} sporočal, koliko casa je vklopljen -v sekundah. - -Napiši skripto, poimenovano beri.sh, ki prek SNMP prebere vrednost s -simpleArbiterDhcpGWSNMP na OID {SNMP_CLIENT_OID} kot član skupnosti -"testers". - -Postavi jo na SNMP klienta, v domaci imenik uporabnika test z geslom test. - -Poskrbi, da bodo podatki na SNMPServer dostopni za skupino (community) studentje. -""", - 'en':""" -Set up three virtual computers, SimpleArbiter with the disk image simpleArbiterDhcp, -SNMPServer and SNMPClient. Write a program called upminutes. This program should output -the uptime of the computer in minutes. Set it up on SNMPClient in the home directory -of the user test with the password test. - -Make sure that the SNMP server reports it's uptime in seconds over SNMP under -OID {SNMP_UPTIME_OID}. - -Write a script called beri.sh that reads the value from the OID -{SNMP_CLIENT_OID} on simpleArbiterDhcpGWSNMP as a member of the -community "testers". -Set it up on SNMPClient in the home directory of the user test. - -Make all the data available over SNMP readable by the "studentje" community. -""" + 'si': '''\ +

+Postavi tri navidezne računalnike: SimpleArbiter, SNMPServer in SNMPClient. + +

+Napiši program upminutes, ki bo izpisal v minutah, koliko časa je racunalnik vklopljen. Postavi ga na SNMPClient v domači imenik uporabnika test z geslom test. + +

+Poskrbi, da bo strežnik SNMP pod OID + +

{{SNMP_UPTIME_OID}}

+ +

+sporočal, koliko časa je vklopljen v sekundah. + +

+Napiši skripto, poimenovano beri.sh, ki prek SNMP prebere vrednost s simpleArbiterDhcpGWSNMP na OID + +

{{SNMP_CLIENT_OID}}

+ +

+kot član skupnosti testers. Postavi jo na SNMPClient, v domači imenik uporabnika test. Poskrbi, da bodo podatki na SNMPServer dostopni za skupino (angl. community) studentje. +''', + 'en': '''\ +

+Set up three virtual computers: SimpleArbiter, SNMPServer and SNMPClient. + +

+Write a program called upminutes. This program should output the uptime of the computer in minutes. Set it up on SNMPClient in the home directory of the user test with the password test. + +

+Make sure that the SNMP server reports its uptime in seconds over SNMP under OID + +

{{SNMP_UPTIME_OID}}

+ +

+Write a script called beri.sh that reads the value from the OID + +

{{SNMP_CLIENT_OID}}

+ +

+on simpleArbiterDhcpGWSNMP as a member of the community testers. Set it up on SNMPClient in the home directory of the user test. Make all the data available over SNMP readable by the community studentje. +''', } computers = { diff --git a/kpov_judge/tasks/snmp_alarms_interfaces/task.py b/kpov_judge/tasks/snmp_alarms_interfaces/task.py index f1e8d62..03d4509 100644 --- a/kpov_judge/tasks/snmp_alarms_interfaces/task.py +++ b/kpov_judge/tasks/snmp_alarms_interfaces/task.py @@ -2,7 +2,7 @@ instructions = { 'si':""" -Postavite tri računalnike - SimpleArbiterSNMP s sliko diska simpleArbiterSNMP, ServerSNMP s sliko +

Postavite tri računalnike - SimpleArbiterSNMP s sliko diska simpleArbiterSNMP, ServerSNMP s sliko
 diska serverSNMP ter SNMPClient.
 
 Na SNMPClient ustvarite uporabnika test z geslom test. V datoteko /home/test/alarmi zapišite
@@ -10,7 +10,7 @@ vse IP in vse OID, s katerih po SNMP prihajajo alarmi. Za vsak alarm zapišite e
 v kateri bosta najprej IP, nato OID, ločena s presledkom.
 
 V datoteko /home/test/vmesniki vpišite imena vseh omrežnih vmesnikov, ki jih prek SNMP dobite na
-ServerSNMP.
+ServerSNMP.

""" } diff --git a/kpov_judge/tasks/vlc_stream_rtp/task.py b/kpov_judge/tasks/vlc_stream_rtp/task.py index bfdfb4f..427fc0e 100644 --- a/kpov_judge/tasks/vlc_stream_rtp/task.py +++ b/kpov_judge/tasks/vlc_stream_rtp/task.py @@ -4,31 +4,28 @@ # TODO: finish this instructions = { - 'si':""" -Postavi navidezni računalnik SimpleArbiter z diska simpleArbiter -ter StudentVLC z diska student-VLC. Poskrbi, da bosta na istem omrežju, od -koder bosta imela dostop tudi do Interneta Na StudentVLC posodobi datoteko -/etc/apt/sources.list, preveri posodobitve in naloži VLC. + 'si': '''\ +

+Postavi navidezni računalnik SimpleArbiter in StudentVLC. Poskrbi, da bosta na istem omrežju, od koder bosta imela dostop tudi do interneta. -Posnemi ali kako drugače ustvari film ter poskrbi, da bo film dostopen na -lokalnem omrežju prek RTP z imenom toka {TOK} na naslovu {NASLOV}, vrata {PORT}. -Računaj, da bodo film lahko videli tvoji sošolci. Kršenje avtorskih pravic -je pri reševanju te naloge strogo prepovedano. -""", - 'en':""" -Set up a virtual computer called SimpleArbiter using the simpleArbiter disk and -a virtual computer called StudentVLC using the student-VLC disk. Make sure they +

+Na StudentVLC posodobi datoteko /etc/apt/sources.list, preveri posodobitve in naloži VLC. + +

+Posnemi ali kako drugače ustvari film ter poskrbi, da bo film dostopen na lokalnem omrežju prek RTP z imenom toka {{TOK}} na naslovu {{NASLOV}}, vrata {{PORT}}. Računaj, da bodo film lahko videli tvoji sošolci. Kršenje avtorskih pravic je pri reševanju te naloge strogo prepovedano. +''', + 'en': '''\ +

+Set up a virtual computer called SimpleArbiter using the simpleArbiter disk and +a virtual computer called StudentVLC using the student-VLC disk. Make sure they are on the same network and that they have access to the Internet. -On StundentVLC, update /etc/apt/sources.list, check the for updates and install -VLC. -Record or otherwise create a movie and make sure the movie is avaliable -on your local network via RTP with the name of the stream {TOK} at the address -{NASLOV} on port {PORT}. -Take into account that the movie may be seen by your classmates. -Copyright infrigement while solving this task is strictly prohibited. +

+On StundentVLC, update /etc/apt/sources.list, check the for updates and install VLC. -""" +

+Record or otherwise create a movie and make sure the movie is avaliable on your local network via RTP with the name of the stream {{TOK}} at the address {{NASLOV}} on port {{PORT}}. Take into account that the movie may be seen by your classmates. Copyright infrigement while solving this task is strictly prohibited. +''', } computers = { diff --git a/kpov_judge/web/kpov_judge/kpov_judge.py b/kpov_judge/web/kpov_judge/kpov_judge.py index 5aa0606..4dfed7b 100755 --- a/kpov_judge/web/kpov_judge/kpov_judge.py +++ b/kpov_judge/web/kpov_judge/kpov_judge.py @@ -235,10 +235,6 @@ def task_greeting(class_id, task_id, lang): for k, v in meta.items(): if v.get('public', False): public_params[k] = params.get(k, "???") - # instructions = instructions.format(**public_params).decode('utf8') - instructions = instructions.format(**public_params) - - # instructions = instructions.format(**public_params).encode('utf8') except Exception as e: instructions = str(e) computer_list = list(db.student_computers.find({'class_id': class_id, 'task_id': task_id, 'student_id': student_id})) @@ -258,11 +254,15 @@ def task_greeting(class_id, task_id, lang): openstackCreated = False return render_template('task_greeting.html', disk_base_url='/'.join([app.config['STUDENT_DISK_URL'], student_id, class_id, task_id, '']), + class_id=class_id, + task_id=task_id, computers=computer_list, backing_images=sorted(backing_images), - lang=lang, + lang='sl' if lang == 'si' else lang, # TODO s/si/sl in all tasks (and maybe elsewhere) openstack=openstackCreated, - instructions=instructions) + instructions=jinja2.Template(instructions), + **public_params, + ) @app.route('/tasks///params.json', methods=['GET', 'POST']) diff --git a/kpov_judge/web/kpov_judge/templates/class_tasks.html b/kpov_judge/web/kpov_judge/templates/class_tasks.html index 5a29ae7..050874b 100644 --- a/kpov_judge/web/kpov_judge/templates/class_tasks.html +++ b/kpov_judge/web/kpov_judge/templates/class_tasks.html @@ -11,6 +11,6 @@ Trenutno so na voljo naloge:

{{t}} +
{{t}} {% endfor %}

diff --git a/kpov_judge/web/kpov_judge/templates/task_greeting.html b/kpov_judge/web/kpov_judge/templates/task_greeting.html index 20da231..5a59fe0 100644 --- a/kpov_judge/web/kpov_judge/templates/task_greeting.html +++ b/kpov_judge/web/kpov_judge/templates/task_greeting.html @@ -33,7 +33,8 @@ section > ul {

-{{instructions}} + +{% include instructions %}

Podrobna navodila (HOWTO) -- cgit v1.2.1 From b41b2bebc05585a6e374dafafae9bed2503becad Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sat, 13 Oct 2018 03:29:33 +0200 Subject: I18N --- kpov_judge/web/kpov_judge/babel.cfg | 3 + kpov_judge/web/kpov_judge/kpov_judge.py | 27 +++++-- .../web/kpov_judge/templates/class_tasks.html | 6 +- kpov_judge/web/kpov_judge/templates/index.html | 9 +-- .../web/kpov_judge/templates/task_greeting.html | 23 +++--- .../translations/en/LC_MESSAGES/messages.po | 86 +++++++++++++++++++++ .../translations/sl/LC_MESSAGES/messages.po | 87 ++++++++++++++++++++++ 7 files changed, 216 insertions(+), 25 deletions(-) create mode 100644 kpov_judge/web/kpov_judge/babel.cfg create mode 100644 kpov_judge/web/kpov_judge/translations/en/LC_MESSAGES/messages.po create mode 100644 kpov_judge/web/kpov_judge/translations/sl/LC_MESSAGES/messages.po diff --git a/kpov_judge/web/kpov_judge/babel.cfg b/kpov_judge/web/kpov_judge/babel.cfg new file mode 100644 index 0000000..f0234b3 --- /dev/null +++ b/kpov_judge/web/kpov_judge/babel.cfg @@ -0,0 +1,3 @@ +[python: **.py] +[jinja2: **/templates/**.html] +extensions=jinja2.ext.autoescape,jinja2.ext.with_ diff --git a/kpov_judge/web/kpov_judge/kpov_judge.py b/kpov_judge/web/kpov_judge/kpov_judge.py index 4dfed7b..db2359d 100755 --- a/kpov_judge/web/kpov_judge/kpov_judge.py +++ b/kpov_judge/web/kpov_judge/kpov_judge.py @@ -1,18 +1,33 @@ #!/usr/bin/env python3 -import flask -from flask import Flask, g, session, redirect, url_for, abort, render_template, flash, app, request, Response -import pymongo +import collections +import datetime import json import random import settings -import datetime -import kpov_util -from kpov_draw_setup import draw_setup import traceback +from kpov_draw_setup import draw_setup +import kpov_util + +import pymongo +import flask +from flask import Flask, g, session, redirect, url_for, abort, render_template, flash, app, request, Response +from flask.ext.babel import Babel, gettext, ngettext +import jinja2 + app = Flask(__name__) app.config.from_object(settings) +babel = Babel(app) + +@babel.localeselector +def get_locale(): + # terrible hack, should store as user preference in the DB + if '/en/' in request.path: + return 'en' + if '/si/' in request.path: + return 'sl' + return request.accept_languages.best_match(['sl', 'en']) dummy_task = """ def task(neznano_ime_naloge): diff --git a/kpov_judge/web/kpov_judge/templates/class_tasks.html b/kpov_judge/web/kpov_judge/templates/class_tasks.html index 050874b..4b6a523 100644 --- a/kpov_judge/web/kpov_judge/templates/class_tasks.html +++ b/kpov_judge/web/kpov_judge/templates/class_tasks.html @@ -4,10 +4,10 @@

↩ {{clas.name}}

-Zdravo, {{student_id}}. +{{ _('Zdravo, %(student)s.', student=student_id) }} -

-Trenutno so na voljo naloge: +

KPOV Judge

-Zdravo, {{student_id}}. +{{ _('Zdravo, %(student)s.', student=student_id) }} -

-Trenutno so na voljo predmeti: +

{{c.name}}
{{c.name}} {% endfor %}

- diff --git a/kpov_judge/web/kpov_judge/templates/task_greeting.html b/kpov_judge/web/kpov_judge/templates/task_greeting.html index 5a59fe0..086d6b1 100644 --- a/kpov_judge/web/kpov_judge/templates/task_greeting.html +++ b/kpov_judge/web/kpov_judge/templates/task_greeting.html @@ -10,6 +10,7 @@ img.setup { max-width: 20em; } section.data { + clear: both; columns: 2; } section.data > section { @@ -37,14 +38,14 @@ section > ul { {% include instructions %}

-Podrobna navodila (HOWTO) +{{ _('Podrobna navodila.') }}

Računalniki

-Slike diskov za to nalogo: +{{ _('Slike diskov za to nalogo:') }} {% for c in computers %}

@@ -56,16 +57,16 @@ Slike diskov za to nalogo: {% endfor %} {% else %} - Slike navideznih diskov so v izdelavi in bodo kmalu na voljo. +
{{ _('Slike navideznih diskov so v izdelavi in bodo kmalu na voljo.') }} {% endif %}

{% endfor %}

{% if backing_images %} -

Osnovne slike

-Te slike so enake za vse naloge in jih prenesete samo enkrat. +{{ _('Te slike so enake za vse naloge. Prenesite samo tiste, ki jih še nimate.') }}

{% for b in backing_images %} @@ -77,14 +78,14 @@ Te slike so enake za vse naloge in jih prenesete samo enkrat.

Rezultati

-Ogledate si lahko: +{{ _('Ogledate si lahko:') }}

rezultate (json)
parametre (json, opisi parametrov)
preverjalni program (source)
{{ _('rezultate') }} (json)
{{ _('parametre') }} (json, {{ _('opisi parametrov') }})
{{ _('preverjalni program') }} (source)

diff --git a/kpov_judge/web/kpov_judge/translations/en/LC_MESSAGES/messages.po b/kpov_judge/web/kpov_judge/translations/en/LC_MESSAGES/messages.po new file mode 100644 index 0000000..9708420 --- /dev/null +++ b/kpov_judge/web/kpov_judge/translations/en/LC_MESSAGES/messages.po @@ -0,0 +1,86 @@ +# English translations for PROJECT. +# Copyright (C) 2018 ORGANIZATION +# This file is distributed under the same license as the PROJECT project. +# FIRST AUTHOR , 2018. +# +msgid "" +msgstr "" +"Project-Id-Version: PROJECT VERSION\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2018-10-13 02:41+0200\n" +"PO-Revision-Date: 2018-10-13 02:29+0200\n" +"Last-Translator: FULL NAME \n" +"Language-Team: en \n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 1.3\n" + +#: templates/class_tasks.html:7 templates/index.html:7 +#, python-format +msgid "Zdravo, %(student)s." +msgstr "Hi, %(student)s." + +#: templates/class_tasks.html:10 +msgid "Naloge" +msgstr "Tasks" + +#: templates/index.html:10 +msgid "Predmeti" +msgstr "Classes" + +#: templates/task_greeting.html:41 +msgid "Podrobna navodila." +msgstr "Detalied instructions." + +#: templates/task_greeting.html:46 +msgid "Računalniki" +msgstr "Computers" + +#: templates/task_greeting.html:48 +msgid "Slike diskov za to nalogo:" +msgstr "Disk images for this task:" + +#: templates/task_greeting.html:60 +msgid "Slike navideznih diskov so v izdelavi in bodo kmalu na voljo." +msgstr "Disk images are being generated, please wait." + +#: templates/task_greeting.html:67 +msgid "Osnovne slike" +msgstr "Backing images" + +#: templates/task_greeting.html:69 +msgid "Te slike so enake za vse naloge. Prenesite samo tiste, ki jih še nimate." +msgstr "These disk images are the same for all exercises. Download only those you don’t have yet." + +#: templates/task_greeting.html:81 +msgid "Rezultati" +msgstr "Results" + +#: templates/task_greeting.html:83 +msgid "Ogledate si lahko:" +msgstr "You can view:" + +#: templates/task_greeting.html:86 +msgid "rezultate" +msgstr "results" + +#: templates/task_greeting.html:87 +msgid "parametre" +msgstr "parameters" + +#: templates/task_greeting.html:87 +msgid "opisi parametrov" +msgstr "parameter descriptions" + +#: templates/task_greeting.html:88 +msgid "preverjalni program" +msgstr "checking program" + +#~ msgid "Trenutno so na voljo naloge:" +#~ msgstr "Available tasks:" + +#~ msgid "Trenutno so na voljo predmeti:" +#~ msgstr "Available classes" + diff --git a/kpov_judge/web/kpov_judge/translations/sl/LC_MESSAGES/messages.po b/kpov_judge/web/kpov_judge/translations/sl/LC_MESSAGES/messages.po new file mode 100644 index 0000000..7027a4c --- /dev/null +++ b/kpov_judge/web/kpov_judge/translations/sl/LC_MESSAGES/messages.po @@ -0,0 +1,87 @@ +# Slovenian translations for PROJECT. +# Copyright (C) 2018 ORGANIZATION +# This file is distributed under the same license as the PROJECT project. +# FIRST AUTHOR , 2018. +# +msgid "" +msgstr "" +"Project-Id-Version: PROJECT VERSION\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2018-10-13 02:41+0200\n" +"PO-Revision-Date: 2018-10-13 02:29+0200\n" +"Last-Translator: FULL NAME \n" +"Language-Team: sl \n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 " +"|| n%100==4 ? 2 : 3)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 1.3\n" + +#: templates/class_tasks.html:7 templates/index.html:7 +#, python-format +msgid "Zdravo, %(student)s." +msgstr "" + +#: templates/class_tasks.html:10 +msgid "Naloge" +msgstr "" + +#: templates/index.html:10 +msgid "Predmeti" +msgstr "" + +#: templates/task_greeting.html:41 +msgid "Podrobna navodila." +msgstr "" + +#: templates/task_greeting.html:46 +msgid "Računalniki" +msgstr "" + +#: templates/task_greeting.html:48 +msgid "Slike diskov za to nalogo:" +msgstr "" + +#: templates/task_greeting.html:60 +msgid "Slike navideznih diskov so v izdelavi in bodo kmalu na voljo." +msgstr "" + +#: templates/task_greeting.html:67 +msgid "Osnovne slike" +msgstr "" + +#: templates/task_greeting.html:69 +msgid "Te slike so enake za vse naloge. Prenesite samo tiste, ki jih še nimate." +msgstr "" + +#: templates/task_greeting.html:81 +msgid "Rezultati" +msgstr "" + +#: templates/task_greeting.html:83 +msgid "Ogledate si lahko:" +msgstr "" + +#: templates/task_greeting.html:86 +msgid "rezultate" +msgstr "" + +#: templates/task_greeting.html:87 +msgid "parametre" +msgstr "" + +#: templates/task_greeting.html:87 +msgid "opisi parametrov" +msgstr "" + +#: templates/task_greeting.html:88 +msgid "preverjalni program" +msgstr "" + +#~ msgid "Trenutno so na voljo naloge:" +#~ msgstr "" + +#~ msgid "Trenutno so na voljo predmeti:" +#~ msgstr "" + -- cgit v1.2.1 From 4abbcde4b21be7d3c07a2d483c23a951ff57cb12 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sat, 13 Oct 2018 03:30:35 +0200 Subject: Fix urllib for Python 3 --- kpov_judge/add_task.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kpov_judge/add_task.py b/kpov_judge/add_task.py index 92e0c37..ea11c9c 100755 --- a/kpov_judge/add_task.py +++ b/kpov_judge/add_task.py @@ -15,10 +15,10 @@ def task_check(results, params): data = urllib.parse.urlencode({ 'results': json.dumps(results), 'params': json.dumps(params) - }) + }).encode() req = urllib.request.Request('{task_url}/{task_name}/results.json'.format(task_url=task_url, task_name=task_name), data) response = urllib.request.urlopen(req) - response_dict = json.loads(response.read()) + response_dict = json.loads(response.read().decode()) hints = response_dict.get('hints', []) hints = ['status: ' + response_dict.get('status', '')] + hints return response_dict.get('result', 'No result'), "\n".join(hints) -- cgit v1.2.1 From 64885ef1675f32cc3ce9d59aa0f6c31064338eec Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sat, 13 Oct 2018 03:30:56 +0200 Subject: web.results_post: call task_check with defaultdict(str) Many tasks barf on missing keys. --- kpov_judge/web/kpov_judge/kpov_judge.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/kpov_judge/web/kpov_judge/kpov_judge.py b/kpov_judge/web/kpov_judge/kpov_judge.py index db2359d..2febf9a 100755 --- a/kpov_judge/web/kpov_judge/kpov_judge.py +++ b/kpov_judge/web/kpov_judge/kpov_judge.py @@ -92,8 +92,7 @@ def results_post(class_id, task_id, results): task_check_source = db.task_checkers.find_one({'class_id': class_id, 'task_id': task_id})['source'] d = {} exec(compile(task_check_source, 'checker.py', 'exec'), globals(), d) - # raise Exception(str(params)) - res, hints = d['task_check'](results, params) + res, hints = d['task_check'](collections.defaultdict(str, results), params) except Exception as e: hints = ["Checker died: " + str(e)] res = 0 -- cgit v1.2.1 From cc12d3b303e5d1a2e88073d0d6f7ff2f4210273f Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sat, 13 Oct 2018 03:32:16 +0200 Subject: add_task: fix returned hints in online task_check --- kpov_judge/add_task.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kpov_judge/add_task.py b/kpov_judge/add_task.py index ea11c9c..aab5e46 100755 --- a/kpov_judge/add_task.py +++ b/kpov_judge/add_task.py @@ -21,7 +21,7 @@ def task_check(results, params): response_dict = json.loads(response.read().decode()) hints = response_dict.get('hints', []) hints = ['status: ' + response_dict.get('status', '')] + hints - return response_dict.get('result', 'No result'), "\n".join(hints) + return response_dict.get('result', 'No result'), hints uploading_task_check_source = inspect.getsource(task_check) -- cgit v1.2.1 From e17416d594642c5e9eaf905f37cef10021071ab1 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sat, 13 Oct 2018 19:15:56 +0200 Subject: Show results and parameters on task page --- kpov_judge/web/kpov_judge/kpov_judge.py | 26 ++++++++++++++---- kpov_judge/web/kpov_judge/static/style.css | 17 ++++++++++++ .../web/kpov_judge/templates/task_greeting.html | 31 +++++++++++++++------- 3 files changed, 59 insertions(+), 15 deletions(-) diff --git a/kpov_judge/web/kpov_judge/kpov_judge.py b/kpov_judge/web/kpov_judge/kpov_judge.py index 2febf9a..c0bf885 100755 --- a/kpov_judge/web/kpov_judge/kpov_judge.py +++ b/kpov_judge/web/kpov_judge/kpov_judge.py @@ -13,7 +13,7 @@ import kpov_util import pymongo import flask from flask import Flask, g, session, redirect, url_for, abort, render_template, flash, app, request, Response -from flask.ext.babel import Babel, gettext, ngettext +from flask.ext.babel import Babel, gettext, ngettext, format_datetime, _ import jinja2 app = Flask(__name__) @@ -245,10 +245,14 @@ def task_greeting(class_id, task_id, lang): instr_ok = False if instr_ok: try: - public_params = {} + public_params = [] for k, v in meta.items(): if v.get('public', False): - public_params[k] = params.get(k, "???") + public_params += [{ + 'name': k, + 'value': params.get(k), + 'description': v.get('descriptions', {}).get(lang) + }] except Exception as e: instructions = str(e) computer_list = list(db.student_computers.find({'class_id': class_id, 'task_id': task_id, 'student_id': student_id})) @@ -266,6 +270,17 @@ def task_greeting(class_id, task_id, lang): openstackCreated = True else: openstackCreated = False + + try: + result = db.results.find_one( + {'$query': {'class_id': class_id, 'task_id': task_id, 'student_id': student_id}, + '$orderby': collections.OrderedDict([('result', -1), ('time', 1)])}, + {'result': 1, 'status': 1, 'hints': 1, 'time': True, '_id': 0}) + result['time'] = format_datetime(result['time']) + print(result) + except Exception: + result = None + return render_template('task_greeting.html', disk_base_url='/'.join([app.config['STUDENT_DISK_URL'], student_id, class_id, task_id, '']), class_id=class_id, @@ -275,8 +290,9 @@ def task_greeting(class_id, task_id, lang): lang='sl' if lang == 'si' else lang, # TODO s/si/sl in all tasks (and maybe elsewhere) openstack=openstackCreated, instructions=jinja2.Template(instructions), - **public_params, - ) + params=public_params, + result=result, + **{p['name']: p['value'] for p in public_params}) @app.route('/tasks///params.json', methods=['GET', 'POST']) diff --git a/kpov_judge/web/kpov_judge/static/style.css b/kpov_judge/web/kpov_judge/static/style.css index ade0909..69ac87c 100644 --- a/kpov_judge/web/kpov_judge/static/style.css +++ b/kpov_judge/web/kpov_judge/static/style.css @@ -8,6 +8,22 @@ body { padding: 1em 2em; } +code { + background-color: #d6d6d6; + font-size: 1.2em; + padding: 0 0.25em; +} + +dl { + margin-top: 0.5em; +} +dt { + margin-top: 0.5em; +} +dd { + margin-left: 1em; +} + h1 { margin-bottom: 0.5em; } @@ -22,6 +38,7 @@ p { pre { margin-left: 1em; + overflow: auto; } .tooltip { /* hide and position tooltip */ diff --git a/kpov_judge/web/kpov_judge/templates/task_greeting.html b/kpov_judge/web/kpov_judge/templates/task_greeting.html index 086d6b1..1825726 100644 --- a/kpov_judge/web/kpov_judge/templates/task_greeting.html +++ b/kpov_judge/web/kpov_judge/templates/task_greeting.html @@ -53,7 +53,7 @@ section > ul { {% if 'disk_urls' in c %}

{{u['name']}} +
{{u['name']}} {% endfor %}

{% else %} @@ -70,7 +70,7 @@ section > ul {

{{b}}
{{b}}

{% endif %} @@ -78,16 +78,27 @@ section > ul {

-{{ _('Ogledate si lahko:') }} +{% if result is none %} +{{ _('Naloga nima še nobenega poskusa.') }} +{% elif result['result'] == 10 %} +{{ _('Naloga je uspešno opravljena dne %(time)s.', time=result['time']) }} +{% else %} +{{ _('Naloga še ni opravljena, najvišji rezultat je %(score)s.', score=result['result']) }} +{% endif %} -

{{ _('rezultate') }} (json)
{{ _('parametre') }} (json, {{ _('opisi parametrov') }})
{{ _('preverjalni program') }} (source)

+{{ _('Program za preverjanje.') }} + +

{{ p['name'] }}{% if p['description'] %} … {{ p['description'] }}{% endif %}: {{ p['value'] }}

-- 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/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 From dd8f99e7b804c9e99fe40b430ee565acad8b3fca Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sat, 13 Oct 2018 19:23:10 +0200 Subject: Add language links to task page --- kpov_judge/web/kpov_judge/templates/task_greeting.html | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/kpov_judge/web/kpov_judge/templates/task_greeting.html b/kpov_judge/web/kpov_judge/templates/task_greeting.html index 1825726..73294e5 100644 --- a/kpov_judge/web/kpov_judge/templates/task_greeting.html +++ b/kpov_judge/web/kpov_judge/templates/task_greeting.html @@ -2,6 +2,10 @@ -

↩ {{task_id}}

+↩ {{task_id}} +[ +{% for lang in ('en', 'si') %} +{{lang}} +{% endfor %} +] +

-- cgit v1.2.1 From 38cc4da1db6de7a558bed53e4da6fa7c2c27d164 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sat, 13 Oct 2018 19:40:56 +0200 Subject: Update translations --- .../translations/en/LC_MESSAGES/messages.po | 68 +++++++++++++--------- .../translations/sl/LC_MESSAGES/messages.po | 58 ++++++++++++------ 2 files changed, 81 insertions(+), 45 deletions(-) diff --git a/kpov_judge/web/kpov_judge/translations/en/LC_MESSAGES/messages.po b/kpov_judge/web/kpov_judge/translations/en/LC_MESSAGES/messages.po index 9708420..df2c29d 100644 --- a/kpov_judge/web/kpov_judge/translations/en/LC_MESSAGES/messages.po +++ b/kpov_judge/web/kpov_judge/translations/en/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2018-10-13 02:41+0200\n" +"POT-Creation-Date: 2018-10-13 19:25+0200\n" "PO-Revision-Date: 2018-10-13 02:29+0200\n" "Last-Translator: FULL NAME \n" "Language-Team: en \n" @@ -30,53 +30,57 @@ msgstr "Tasks" msgid "Predmeti" msgstr "Classes" -#: templates/task_greeting.html:41 +#: templates/task_greeting.html:52 msgid "Podrobna navodila." msgstr "Detalied instructions." -#: templates/task_greeting.html:46 +#: templates/task_greeting.html:57 msgid "Računalniki" msgstr "Computers" -#: templates/task_greeting.html:48 +#: templates/task_greeting.html:59 msgid "Slike diskov za to nalogo:" msgstr "Disk images for this task:" -#: templates/task_greeting.html:60 +#: templates/task_greeting.html:71 msgid "Slike navideznih diskov so v izdelavi in bodo kmalu na voljo." msgstr "Disk images are being generated, please wait." -#: templates/task_greeting.html:67 +#: templates/task_greeting.html:78 msgid "Osnovne slike" msgstr "Backing images" -#: templates/task_greeting.html:69 +#: templates/task_greeting.html:80 msgid "Te slike so enake za vse naloge. Prenesite samo tiste, ki jih še nimate." -msgstr "These disk images are the same for all exercises. Download only those you don’t have yet." +msgstr "" +"These disk images are the same for all exercises. Download only those you" +" don’t have yet." -#: templates/task_greeting.html:81 -msgid "Rezultati" -msgstr "Results" +#: templates/task_greeting.html:92 +msgid "Rezultat" +msgstr "Result" -#: templates/task_greeting.html:83 -msgid "Ogledate si lahko:" -msgstr "You can view:" +#: templates/task_greeting.html:95 +msgid "Naloga nima še nobenega poskusa." +msgstr "This task has not been attempted yet." -#: templates/task_greeting.html:86 -msgid "rezultate" -msgstr "results" +#: templates/task_greeting.html:97 +#, python-format +msgid "Naloga je uspešno opravljena dne %(time)s." +msgstr "This task was solved on %(time)s." -#: templates/task_greeting.html:87 -msgid "parametre" -msgstr "parameters" +#: templates/task_greeting.html:99 +#, python-format +msgid "Naloga še ni opravljena, najvišji rezultat je %(score)s." +msgstr "This task has not been solved yet, the highest score is %(score)s." -#: templates/task_greeting.html:87 -msgid "opisi parametrov" -msgstr "parameter descriptions" +#: templates/task_greeting.html:103 +msgid "Program za preverjanje." +msgstr "Testing program." -#: templates/task_greeting.html:88 -msgid "preverjalni program" -msgstr "checking program" +#: templates/task_greeting.html:105 +msgid "Parametri" +msgstr "Parameters" #~ msgid "Trenutno so na voljo naloge:" #~ msgstr "Available tasks:" @@ -84,3 +88,15 @@ msgstr "checking program" #~ msgid "Trenutno so na voljo predmeti:" #~ msgstr "Available classes" +#~ msgid "Rezultati" +#~ msgstr "Results" + +#~ msgid "Ogledate si lahko:" +#~ msgstr "You can view:" + +#~ msgid "opisi parametrov" +#~ msgstr "parameter descriptions" + +#~ msgid "preverjalni program" +#~ msgstr "checking program" + diff --git a/kpov_judge/web/kpov_judge/translations/sl/LC_MESSAGES/messages.po b/kpov_judge/web/kpov_judge/translations/sl/LC_MESSAGES/messages.po index 7027a4c..18458f9 100644 --- a/kpov_judge/web/kpov_judge/translations/sl/LC_MESSAGES/messages.po +++ b/kpov_judge/web/kpov_judge/translations/sl/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2018-10-13 02:41+0200\n" +"POT-Creation-Date: 2018-10-13 19:25+0200\n" "PO-Revision-Date: 2018-10-13 02:29+0200\n" "Last-Translator: FULL NAME \n" "Language-Team: sl \n" @@ -31,52 +31,54 @@ msgstr "" msgid "Predmeti" msgstr "" -#: templates/task_greeting.html:41 +#: templates/task_greeting.html:52 msgid "Podrobna navodila." msgstr "" -#: templates/task_greeting.html:46 +#: templates/task_greeting.html:57 msgid "Računalniki" msgstr "" -#: templates/task_greeting.html:48 +#: templates/task_greeting.html:59 msgid "Slike diskov za to nalogo:" msgstr "" -#: templates/task_greeting.html:60 +#: templates/task_greeting.html:71 msgid "Slike navideznih diskov so v izdelavi in bodo kmalu na voljo." msgstr "" -#: templates/task_greeting.html:67 +#: templates/task_greeting.html:78 msgid "Osnovne slike" msgstr "" -#: templates/task_greeting.html:69 +#: templates/task_greeting.html:80 msgid "Te slike so enake za vse naloge. Prenesite samo tiste, ki jih še nimate." msgstr "" -#: templates/task_greeting.html:81 -msgid "Rezultati" +#: templates/task_greeting.html:92 +msgid "Rezultat" msgstr "" -#: templates/task_greeting.html:83 -msgid "Ogledate si lahko:" +#: templates/task_greeting.html:95 +msgid "Naloga nima še nobenega poskusa." msgstr "" -#: templates/task_greeting.html:86 -msgid "rezultate" +#: templates/task_greeting.html:97 +#, python-format +msgid "Naloga je uspešno opravljena dne %(time)s." msgstr "" -#: templates/task_greeting.html:87 -msgid "parametre" +#: templates/task_greeting.html:99 +#, python-format +msgid "Naloga še ni opravljena, najvišji rezultat je %(score)s." msgstr "" -#: templates/task_greeting.html:87 -msgid "opisi parametrov" +#: templates/task_greeting.html:103 +msgid "Program za preverjanje." msgstr "" -#: templates/task_greeting.html:88 -msgid "preverjalni program" +#: templates/task_greeting.html:105 +msgid "Parametri" msgstr "" #~ msgid "Trenutno so na voljo naloge:" @@ -85,3 +87,21 @@ msgstr "" #~ msgid "Trenutno so na voljo predmeti:" #~ msgstr "" +#~ msgid "Rezultati" +#~ msgstr "" + +#~ msgid "Ogledate si lahko:" +#~ msgstr "" + +#~ msgid "rezultate" +#~ msgstr "" + +#~ msgid "parametre" +#~ msgstr "" + +#~ msgid "opisi parametrov" +#~ msgstr "" + +#~ msgid "preverjalni program" +#~ msgstr "" + -- cgit v1.2.1 From fe23a3348098bc62b91c866771bd6585e01e4929 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sat, 13 Oct 2018 20:17:56 +0200 Subject: =?UTF-8?q?Oops,=20don=E2=80=99t=20redefine=20prepare=5Fdisks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kpov_judge/tasks/mock_entrance_exam/task.py | 1 - 1 file changed, 1 deletion(-) diff --git a/kpov_judge/tasks/mock_entrance_exam/task.py b/kpov_judge/tasks/mock_entrance_exam/task.py index 01d4fa5..ad51c2a 100644 --- a/kpov_judge/tasks/mock_entrance_exam/task.py +++ b/kpov_judge/tasks/mock_entrance_exam/task.py @@ -310,5 +310,4 @@ 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) -- cgit v1.2.1 From 5439f75ca2e1a38803a96853b6cac0ce5c9f58ce Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sat, 13 Oct 2018 21:36:23 +0200 Subject: A couple of tweaks --- kpov_judge/web/kpov_judge/static/style.css | 3 ++- kpov_judge/web/kpov_judge/templates/task_greeting.html | 3 ++- kpov_judge/web/kpov_judge/translations/en/LC_MESSAGES/messages.po | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/kpov_judge/web/kpov_judge/static/style.css b/kpov_judge/web/kpov_judge/static/style.css index 69ac87c..4511302 100644 --- a/kpov_judge/web/kpov_judge/static/style.css +++ b/kpov_judge/web/kpov_judge/static/style.css @@ -10,8 +10,9 @@ body { code { background-color: #d6d6d6; + color: black; font-size: 1.2em; - padding: 0 0.25em; + padding: 0.20em 0.25em 0; } dl { diff --git a/kpov_judge/web/kpov_judge/templates/task_greeting.html b/kpov_judge/web/kpov_judge/templates/task_greeting.html index 73294e5..49288e3 100644 --- a/kpov_judge/web/kpov_judge/templates/task_greeting.html +++ b/kpov_judge/web/kpov_judge/templates/task_greeting.html @@ -19,6 +19,7 @@ section.data { } section.data > section { display: inline-block; + margin: 0 1em; } section.disks > section > h1 { margin-bottom: 0; @@ -36,7 +37,7 @@ section > ul {

↩ {{task_id}} -[ + [ {% for lang in ('en', 'si') %} {{lang}} {% endfor %} diff --git a/kpov_judge/web/kpov_judge/translations/en/LC_MESSAGES/messages.po b/kpov_judge/web/kpov_judge/translations/en/LC_MESSAGES/messages.po index df2c29d..ef9a7bb 100644 --- a/kpov_judge/web/kpov_judge/translations/en/LC_MESSAGES/messages.po +++ b/kpov_judge/web/kpov_judge/translations/en/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2018-10-13 19:25+0200\n" -"PO-Revision-Date: 2018-10-13 02:29+0200\n" +"PO-Revision-Date: 2018-10-13 20:57+0200\n" "Last-Translator: FULL NAME \n" "Language-Team: en \n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" @@ -32,7 +32,7 @@ msgstr "Classes" #: templates/task_greeting.html:52 msgid "Podrobna navodila." -msgstr "Detalied instructions." +msgstr "Detailed instructions." #: templates/task_greeting.html:57 msgid "Računalniki" -- cgit v1.2.1

{{task_id}}

Navodila

Navodila

Računalniki v vaji

Računalniki

{{c['name']}}

{{c['name']}}

Osnovne slike

Osnovne slike

Rezultati

↩ {{clas.name}}

KPOV Judge

{{task_id}}

↩ {{task_id}}

Navodila

Računalniki

{{c['name']}}

Osnovne slike

Rezultati

↩ {{clas.name}}

{{ _('Naloge') }}

KPOV Judge

{{ _('Predmeti') }}

Računalniki

{{ _('Računalniki') }}

Osnovne slike

{{ _('Osnovne slike') }}

Rezultati

{{ _('Rezultati') }}

{{ _('Rezultati') }}

{{ _('Rezultat') }}

{{ _('Parametri') }}

↩ {{task_id}}

+↩ {{task_id}} +[ +{% for lang in ('en', 'si') %} +{{lang}} +{% endfor %} +] +