From 9a4a0fc127db7d81aacf297c3e2cfbdb1fbc2817 Mon Sep 17 00:00:00 2001 From: "zk7052@student.uni-lj.si" Date: Mon, 19 Jan 2015 21:45:25 +0000 Subject: Popravljene slovnicne napake pri nekaterih taskih, pri nekaterih je bilo vse ok in pri ostalih pa so manjkale instrukcije oz. howto in ni bilo kaj za pregledat. git-svn-id: https://svn.lusy.fri.uni-lj.si/kpov-public-svn/kpov-public@213 5cf9fbd1-b2bc-434c-b4b7-e852f4f63414 --- kpov_judge/tasks/copy_rename_100_files/task.py | 2 +- kpov_judge/tasks/copy_rename_20_files_tail_env/howtos/en/index.html | 2 +- kpov_judge/tasks/copy_rename_20_files_tail_env/howtos/si/index.html | 2 +- kpov_judge/tasks/ldap_search/howtos/si/index.html | 4 ++-- kpov_judge/tasks/nat_port_forward/task.py | 2 +- kpov_judge/tasks/nat_vlc/howtos/en/index.html | 2 +- kpov_judge/tasks/openvpn_simple_smb/howtos/en/index.html | 2 +- kpov_judge/tasks/radius_mysql_pam/task.py | 4 ++-- kpov_judge/tasks/set_ip_static_dhcp/task.py | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/kpov_judge/tasks/copy_rename_100_files/task.py b/kpov_judge/tasks/copy_rename_100_files/task.py index 39fec0a..6ff8d2c 100644 --- a/kpov_judge/tasks/copy_rename_100_files/task.py +++ b/kpov_judge/tasks/copy_rename_100_files/task.py @@ -7,7 +7,7 @@ instructions = { 'si':u""" 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. +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. """ diff --git a/kpov_judge/tasks/copy_rename_20_files_tail_env/howtos/en/index.html b/kpov_judge/tasks/copy_rename_20_files_tail_env/howtos/en/index.html index 6f56e19..b1008cc 100644 --- a/kpov_judge/tasks/copy_rename_20_files_tail_env/howtos/en/index.html +++ b/kpov_judge/tasks/copy_rename_20_files_tail_env/howtos/en/index.html @@ -7,7 +7,7 @@

Instructions

    -
  1. Log into your system and in your home folder you will find a directory called Mapa containing some 20 files.
    2. +
  2. Log into your system and in your home folder you will find a directory called Mapa containing 20 files.
  3. Rename all files, by replacing all minus signs with underscores using the command: "rename 's/-/_/' *".
  4. Remove all files from /home/user/mapa/mojimenik into /home/user/novi using command: "mkdir-p /home/user/novi && mv /home/user/mapa/mojimenik/* /home/user/novi"
  5. Write all regular files containing a string "mama" into file "mama.txt", and all errors in file "napake.txt" by using: "find . -type f | grep mama 1> mama.txt 2> napake.txt".
    6. diff --git a/kpov_judge/tasks/copy_rename_20_files_tail_env/howtos/si/index.html b/kpov_judge/tasks/copy_rename_20_files_tail_env/howtos/si/index.html index 5078e8b..d1bf568 100644 --- a/kpov_judge/tasks/copy_rename_20_files_tail_env/howtos/si/index.html +++ b/kpov_judge/tasks/copy_rename_20_files_tail_env/howtos/si/index.html @@ -3,7 +3,7 @@ Prijavi se na sistem. V domai mapi najde imenik Mapa z 20 datotekami. - preimenuj vse datoteke tako, da zamenja minuse s podrtaji - Napii im kraji ukaz, ki vse datoteke iz /home/user/mapa/mojimenik premakne v /home/user/novi - - Napii ukaz, ki s pomojo ukaza grep v datoteko "mama.txt" izpie vse navade (ne skrite) datoteke v trenutnem imeniku, ki vsebujejo niz "mama", v datoteko "napake.txt" pa izpie vse morebitne napake (npr. to, da so nekateri objekti v trenutnem imeniku dejansko imeniki ali napane simboline povezave) + - Napii ukaz, ki s pomojo ukaza grep v datoteko "mama.txt" izpie vse navadne (ne skrite) datoteke v trenutnem imeniku, ki vsebujejo niz "mama", v datoteko "napake.txt" pa izpie vse morebitne napake (npr. to, da so nekateri objekti v trenutnem imeniku dejansko imeniki ali napane simboline povezave) - Napii ukaz, ki bo 5s sledil vsebini /var/log/syslog. V primeru, da se v syslogu pojavi niz "zmeda", naj program izpie "imam ga". Poleg tega naj program med sledenjem syslog-u odteva od 5 do 1 (vsako sekundo naj se izpie naslednja tevilka. - Nastavi okoljsko spremenljivko TEST, da bo imela isto vrednost kot okoljska spremenljivka USER + tevilo okoljskih spremenljivk, ki v imenu ali vrednosti ne vsebujejo besede TEST. Primer: polz37 --> diff --git a/kpov_judge/tasks/ldap_search/howtos/si/index.html b/kpov_judge/tasks/ldap_search/howtos/si/index.html index 381124f..7370099 100644 --- a/kpov_judge/tasks/ldap_search/howtos/si/index.html +++ b/kpov_judge/tasks/ldap_search/howtos/si/index.html @@ -10,8 +10,8 @@ Ustvari 2 virtualna sistema SimpleArbiterDhcp ter LDAPServer ter se s SimpleArbi

    Navodila

    - 1. Snemite disk SimpleArbiterDhcp preko imenika s diski virtualnih naprav. - 2. V Virtualbox ustvarite not racunalnik SimpleArbiterDhcp in uporabite sneti disk.(Slika 1) + 1. Prenesite disk SimpleArbiterDhcp preko imenika s diski virtualnih naprav. + 2. V Virtualbox ustvarite nov racunalnik SimpleArbiterDhcp in uporabite prenešen disk.(Slika 1) 3. Prav tako naredi drugi virtualni sistem poimenovan LDAPServer. 4. Na oba sistema se prijavi kot uporabnik "root" z geslom "kaboom". 5. Na sistemi LDAPServer namesti LDAP z ukazom 'apt-get install ldap-utils.(Slika 2) diff --git a/kpov_judge/tasks/nat_port_forward/task.py b/kpov_judge/tasks/nat_port_forward/task.py index a860842..88b2b3c 100644 --- a/kpov_judge/tasks/nat_port_forward/task.py +++ b/kpov_judge/tasks/nat_port_forward/task.py @@ -5,7 +5,7 @@ instructions = { 'si':u""" -Postavi dva računalnika - SimpleArbiter z diska simpleArbiter ter +Postavi dva računalnika - SimpleArbiter z diska ter NATServer. NATServer naj ima dva omrežna vmesnika - z enim naj bo povezan v Internet, z drugim pa na SimpleArbiter. Poskrbi, da bo NATServer služil kot DHCP strežnik ter privzeti prehod za SimpleArbiter. diff --git a/kpov_judge/tasks/nat_vlc/howtos/en/index.html b/kpov_judge/tasks/nat_vlc/howtos/en/index.html index 46a99d9..6048647 100644 --- a/kpov_judge/tasks/nat_vlc/howtos/en/index.html +++ b/kpov_judge/tasks/nat_vlc/howtos/en/index.html @@ -13,7 +13,7 @@ You can get the disks at polz.si/media/uploads/kpov/virtualke. As for the NATServer VM, you can use any disk you want like base-student-desktop-2014.

    2. NATServer should have two network interfaces, one should connect to the simpleArbiter VM and the other to the internet.

    - Adapter 1 should be NAt and adapter 2 should be Internal Network.
    + Adapter 1 should be NAT and adapter 2 should be Internal Network.
    Simple Arbiter must be connected to the Internal Network.
    slika-1 diff --git a/kpov_judge/tasks/openvpn_simple_smb/howtos/en/index.html b/kpov_judge/tasks/openvpn_simple_smb/howtos/en/index.html index 8e1a2dc..4040a3f 100644 --- a/kpov_judge/tasks/openvpn_simple_smb/howtos/en/index.html +++ b/kpov_judge/tasks/openvpn_simple_smb/howtos/en/index.html @@ -10,7 +10,7 @@ Connect to VPN with OpenVPN. Enable access to files through NFS and copy them through SMB.

    Navodila:


    1. From Directory with images of virtual computers drag twice the picture SimpleArbiterVPN and VPNClient.
    - 2. With VirtualBoxom (or other programs for virtual computers) create two virtual computers and give them VPNCLient.vdi and SimpleArbiterVPN.vdi as disk for storage.
    + 2. With VirtualBox (or other programs for virtual computers) create two virtual computers and give them VPNCLient.vdi and SimpleArbiterVPN.vdi as disk for storage.
    3. On both set two network interface(NAT and Internal) and run them.
    4. On both VM login with username root and password kaboom .

    First part: Set up OpenVPN on SimpleArbiterVPN and VPNClient.

    diff --git a/kpov_judge/tasks/radius_mysql_pam/task.py b/kpov_judge/tasks/radius_mysql_pam/task.py index 621c53b..70b1180 100644 --- a/kpov_judge/tasks/radius_mysql_pam/task.py +++ b/kpov_judge/tasks/radius_mysql_pam/task.py @@ -5,11 +5,11 @@ instructions = { 'si':u""" Ustvari dva navidezna računalnika - SimpleArbiter z diska simpleArbiterDhcp ter -RadiusServer.SimpleArbeiterDhcp dobis na naslovu polz.si/media/uploads/kpov/virtualke.Na RadiusServer namesti OpenRadius. Dodatna navodila za instalacijo najdete na evbergen.home.xs4all.nl/openradius/doc-using-openradius.html.OpenRadius uporablja dve konfiguracijski datoteki. To sta /etc/openradius/configuration in /etc/openradius/behaviour. +RadiusServer. SimpleArbeiterDhcp dobis na naslovu polz.si/media/uploads/kpov/virtualke. Na RadiusServer namesti OpenRadius. Dodatna navodila za instalacijo najdete na evbergen.home.xs4all.nl/openradius/doc-using-openradius.html.OpenRadius uporablja dve konfiguracijski datoteki. To sta /etc/openradius/configuration in /etc/openradius/behaviour. Prejsnja definira serverjeve vire in vmesnike slednja pa nastavi, kako bo server delal z zahtevami. Na SimpleArbiter preberi uporabnisko ime in geslo uporabnika ter ga dodaj v konfiguracijo FreeRadius na RadiusServer. Na SimpleArbiter preberi skrivnost ter poskrbi, da se bo s to skrivnostjo SimpleArbiter lahko povezal -na RadiusServer . +na RadiusServer. Nato na OpenRadius namesti še podatkovno bazo mysql. Na SimpleArbiter preberi še ime podatkovne baze, uporabniško ime na bazi ter geslo, s katerim se bo lahko klient s SimpleArbiter na to bazo lahko povezal. diff --git a/kpov_judge/tasks/set_ip_static_dhcp/task.py b/kpov_judge/tasks/set_ip_static_dhcp/task.py index c06817c..14869f0 100644 --- a/kpov_judge/tasks/set_ip_static_dhcp/task.py +++ b/kpov_judge/tasks/set_ip_static_dhcp/task.py @@ -9,7 +9,7 @@ Ustvari tri navidezne racunalnike. Za prvega uporabi sliko diska simpleArbiterGW, za drugega sliko diska maliNetworkManager, za tretjega sliko diska maliBrezNetworkManager. Racunalnike imenujmo enako kot slike diska. -Na maliBrezNetworkManager izklopi networkmanager in se loti conzole. +Na maliBrezNetworkManager izklopi networkmanager in uporabljaj konzolo. Na obeh rocno nastavi IP naslova ter naslova DNS strežnikov. Naslove dobiš na simpleArbiterGW. """ -- cgit v1.2.1