diff options
author | Timotej Lazar <timotej.lazar@fri.uni-lj.si> | 2018-10-13 03:10:03 +0200 |
---|---|---|
committer | Timotej Lazar <timotej.lazar@fri.uni-lj.si> | 2018-10-13 03:17:06 +0200 |
commit | c5a8b2c72841ad0b58fb36870624737634778056 (patch) | |
tree | 01259a4a3338777031ae730366ea0193f86db222 /kpov_judge/tasks/ldap_search | |
parent | 1cbc2f75ac1adf5ee70971052c819cdca1a0948c (diff) |
HTMLize instructions and use jinja2 to render them
Only fixed tasks for the kpov_2018 class for now.
Diffstat (limited to 'kpov_judge/tasks/ldap_search')
-rw-r--r-- | kpov_judge/tasks/ldap_search/task.py | 87 |
1 files changed, 56 insertions, 31 deletions
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': '''\ +<p> +Ustvari dva navidezna računalnika: <em>SimpleArbiter</em> in <em>LDAPServer</em>. -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 +<p> +Na <em>LDAPServer</em> 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 +<pre><code>DC={{DOMAIN}},DC=kpov,DC=lusy,DC=fri,DC=uni-lj,DC=si</code></pre> -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} +<p> +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}, +<pre><code>CN={{LDAP_USERNAME}},ou=users,DC={{DOMAIN}},DC=kpov,DC=lusy,DC=fri,DC=uni-lj,DC=si</code></pre> + +<p> +z geslom <code>{{LDAP_PASSWORD}}</code> in uporabnika + +<pre><code>CN={{BIND_USERNAME}},ou=users,DC={{DOMAIN}},DC=kpov,DC=lusy,DC=fri,DC=uni-lj,DC=si</code></pre> + +<p> +z geslom <code>{{BIND_PASSWORD}}</code>. + +<p> +Poskrbi, da se bo lahko klient s <em>SimpleArbiter</em> povezal na LDAP strežnik na <em>LDAPServer</em>. +V primeru, da se klient poveže kot <code>{{BIND_USERNAME}}</code> z geslom <code>{{BIND_PASSWORD}}</code>, 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 + +<pre><code>CN={{LDAP_USERNAME}},ou=users,DC={{DOMAIN}},DC=kpov,DC=lusy,DC=fri,DC=uni-lj,DC=si</code></pre> + +<p> +ter ustvarjanje novih objektov v + +<pre><code>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. +</code></pre> +''', + 'en': '''\ +<p> +Create two virtual machines: <em>SimpleArbiter</em> and <em>LDAPServer</em>. -Set up an LDAP server on LDAPServer. Make it responsible for -DC={DOMAIN},DC=kpov,DC=lusy,DC=fri,DC=uni-lj,DC=si +<p> +Set up an LDAP server on <em>LDAPServer</em>. Make it responsible for +<pre><code>DC={{DOMAIN}},DC=kpov,DC=lusy,DC=fri,DC=uni-lj,DC=si</code></pre> + +<p> 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 +<pre><code>CN={{LDAP_USERNAME}},ou=users,DC={{DOMAIN}},DC=kpov,DC=lusy,DC=fri,DC=uni-lj,DC=si</code></pre> + +<p> +with the password <code>{{LDAP_PASSWORD}}</code>, and a user + +<pre><code>CN={{BIND_USERNAME}},ou=users,DC={{DOMAIN}},DC=kpov,DC=lusy,DC=fri,DC=uni-lj,DC=si</code></pre> -with the password {LDAP_PASSWORD} . +<p> +with the password <code>{{LDAP_PASSWORD}}</code> . -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 +<p> +Make sure that a client from <em>SimpleArbiter</em> can connect to the LDAP server on <em>LDAPServer</em>. If the client identifies themself as <code>{{BIND_USERNAME}}</code> with the password <code>{{BIND_PASSWORD}}</code>, 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 +<pre><code>CN={{LDAP_USERNAME}},ou=users,DC={{DOMAIN}},DC=kpov,DC=lusy,DC=fri,DC=uni-lj,DC=si</code></pre> + +<p> +and to create objects in + +<pre><code>DC={{DOMAIN}},DC=kpov,DC=lusy,DC=fri,DC=uni-lj,DC=si CN = Common Name O = Organization OU = Organizational Unit DC = Domain Component - -""" +</code></pre> +''', } computers = { |