git-svn-id: https://svn.lusy.fri.uni-lj.si/kpov-public-svn/kpov-public@337 5cf9fbd1-b2bc-434c-b4b7-e852f4f63414

2 files changed, 25 insertions, 24 deletions

diff --git a/kpov_judge/tasks/set_motd/howtos/en/index.html b/kpov_judge/tasks/set_motd/howtos/en/index.html
index 10bf4c9..2987cc5 100644
--- a/kpov_judge/tasks/set_motd/howtos/en/index.html
+++ b/kpov_judge/tasks/set_motd/howtos/en/index.html
@@ -14,15 +14,15 @@
 <h2>How To</h2>

 

 <ol>

-	<li>Create two virtual machines Student(student-console) and Test(SimpleArbiterDhcpGw) <br> <img src="../images/img4.png" alt="no img"></li>

-	<li>Change the network settings to both virtual machines.  SimpleArbiterDhcpGw: Adapter 1 set it to NAT, for internet access and Adapter 2 to internal network for local network.

+	<li>Create two virtual machines, Student(student-console) and Test(SimpleArbiterDhcpGw) <br> <img src="../images/img4.png" alt="no img"></li>

+	<li>Change the network settings to both virtual machines.  SimpleArbiterDhcpGw: Adapter 1 set it to NAT for internet access, Adapter 2 to internal network for local network.

    	Student: Adapter1 set it to "internal-network" so it is in the same domestic network as SimpleArbiterDhcpGw. <br> <img src="../images/img1.png" alt="no img"> <br> <img src="../images/img2.png" alt="no img"> <br> <img src="../images/img3.png" alt="no img"></li>

-   	<li>Login into <b>Student</b> <br>  <img src="../images/img5.png" alt="no img"></li>

-	<li>In Student(student-console) create a new user (with "adduser username",as the task demands of you ( eg. marjankoral19 ), with a custom password. <br>  <img src="../images/img6.png" alt="no img"></li>

+   	<li>Login on <b>Student</b> <br>  <img src="../images/img5.png" alt="no img"></li>

+	<li>On Student(student-console) create a new user (with "adduser username", as the task demands of you ( eg. marjankoral19 ), with a custom password. <br>  <img src="../images/img6.png" alt="no img"></li>

 	<li>In Student(student-console) open interfaces file ( nano /etc/network/interfaces ) and set the IP <br>

 	<h2>How to use the <strong>nano</strong> text editor </h2>

 	<p>

-	1.) Open the nano editor with the command nano which is followed by the path and name of the file. Example: <strong>nano /etc/myfile</strong>.  If the file doesn't exist, the file will be created by the editor.<br />

+	1.) Open the nano editor with the command nano, which is followed by the path and name of the file. Example: <strong>nano /etc/myfile</strong>.  If the file doesn't exist, the file will be created by the editor.<br />

 	2.) To move in the editor, we use the arrow keys, <strong>backspace</strong> is used for deleting. <br />

 	3.) To save a file press the combination of keys <strong>ctrl</strong> + <strong>O</strong>.  <br />

 	4.) To exit the editor press the combination of keys  <strong>ctrl</strong> + <strong>X</strong>. The editor will ask you, if you really want to exit, you can answer with <strong>y</strong> (yes ) or with <strong>n</strong> ( no ).  <br />

@@ -32,8 +32,8 @@
 	</p>  <img src="../images/img7.png" alt="no img" ></li>

 	<li>We can check which interface belongs to which adapter in Virtual-box with MAC address. Run ifconfig command and compare the HWaddr value with the value in the Virtual-box ( settings => network => adapter => Mac address ) <br /><img src="../images/slika4.png" alt="no img" /><img src="../images/slika3.png" alt="no img"/></li>

 	<li>Then edit the /etc/motd (eg. with nano editor like this: "nano /etc/motd"), file with the specified string. (eg. "Not for Human consumption" ) <br>  <img src="../images/img8.png" alt="no img"> </li>

-	<li>For testing login with the test user into Test(SimpleArbiterDhcpGw) <br>  <img src="../images/img9.png" alt="no img"></li>

-	<li>Then connect to Student with ssh using the user marjankoral19 - ssh marjankoral@ip. <br>  <img src="../images/img10.png" alt="no img"></li>

+	<li>For testing, login with the test user into Test(SimpleArbiterDhcpGw) <br>  <img src="../images/img9.png" alt="no img"></li>

+	<li>Then connect to the Student with ssh, using the user marjankoral19 - ssh marjankoral@ip. <br>  <img src="../images/img10.png" alt="no img"></li>

 	<li>If the login was successful, the Message of the day should apear.</li>

 	<li>To run Kpov_judge, login onto SimpleArbiterDhcpGw, find and run the file test_task.py ( with ./test_task.py as all other scripts )<br /> <img src="../images/img11.png" alt="no img"></li>

 	<li>A window appears as we can see on the image above, then press Enter, enter your username ( eg. dr6784@student.uni-lj.si ), password, task name (eg. 01-preparation-set_motd), enter the string we should get in motd, enter the username and password of a user on Student(student-console)(eg. marjankoral19), the IP of Student(student-console), and after a brief moment we should get the result. <img src="../images/img12.png" alt="no img"> 	</li>

diff --git a/kpov_judge/tasks/set_motd/howtos/si/index.html b/kpov_judge/tasks/set_motd/howtos/si/index.html
index 1a43adb..601b667 100644
--- a/kpov_judge/tasks/set_motd/howtos/si/index.html
+++ b/kpov_judge/tasks/set_motd/howtos/si/index.html
@@ -16,29 +16,30 @@ povežemo na drug racunalnik? Kako ugotovimo IP naslov računalnika? </p>
 <h2>Podrobna navodila</h2>

 

 <ol>

-	<li>Ustvari dva navidezna računalnika Student(student-console) in Test(SimpleArbiterDhcpGw) <br> <img src="../images/img4.png" alt="ni slike"></li>

-	<li>Spremeni omrežne nastavitve obem navideznim računalnikom SimpleArbiterDhcpGw: Adapter 1 na NAT za dostop do interneta in Adapter 2 na "internal network" za lokalno omrežje

-   	Student: Adapter1 na internal-network da je v enakem omrežju kot SimpleArbiterDhcpGw. <br> <img src="../images/img1.png" alt="ni slike" > <br> <img src="../images/img2.png" alt="ni slike"> <br> <img src="../images/img3.png" alt="ni slike"></li>

-   	<li>Prijavi se v računalniku Student <br>  <img src="../images/img5.png" alt="ni slike"></li>

-	<li>Na računalniku Student(student-console) ustvari novega uporabnika (z ukazom "adduser imeuporabnika") kot od tebe zahteva naloga (npr. marjankoral19), geslo določi sam. <br>  <img src="../images/img6.png" alt="ni slike"></li>

-	<li>Računalnik Student, odpri datoteko interfaces ( nano /etc/network/interfaces ) ter nastavi IP <br>  <img src="../images/img7.png" alt="ni slike"></li>

-	<li>Kateri vmesnik (npr. eth0) spada pod kateri adapter (npr. Adapter1 ) lahko preverimo s strojnimi naslovi. Na računalniku zaženemo ukaz ifconfig, pogledamo HWaddr vrednost ter jo primerjamo z vrednostjo v Virtual-boxu (nastavitve => omrežja => adapter => MAC address <br /><img src="../images/slika4.png" alt="ni slike"/><img src="../images/slika3.png" alt="ni slike"/></li>

-	<li>Nato spremeni datoteko /etc/motd (z urejevalnikom nano, primer uporabe: "nano /etc/motd"), zamenjaj z ustreznim nizom kot od tebe zahteva naloga ( npr. "Not for Human consumption" ) <br> 

-	<h2>Kako se uporablja <strong>nano</strong> urejavalnika besedila </h2>

+	<li>Ustvari dva navidezna računalnika, računalnik Student(student-console) ter računalnik Test(SimpleArbiterDhcpGw) <br> <img src="../images/img4.png" alt="ni slike"></li>

+	<li>Spremeni omrežne nastavitve obema navideznima računalnikoma, SimpleArbiterDhcpGw: Adapter 1 na NAT za dostop do interneta, Adapter 2 na "internal network" za lokalno omrežje,

+   	Student: Adapter1 na internal-network, da je v enakem omrežju kot SimpleArbiterDhcpGw. <br> <img src="../images/img1.png" alt="ni slike" > <br> <img src="../images/img2.png" alt="ni slike"> <br> <img src="../images/img3.png" alt="ni slike"></li>

+   	<li>Prijavi se na računalniku Student. <br>  <img src="../images/img5.png" alt="ni slike"></li>

+	<li>Na računalniku Student(student-console) ustvari novega uporabnika (z ukazom "adduser imeuporabnika"), kot to od tebe zahteva naloga (npr. marjankoral19), geslo določi sam. <br>  <img src="../images/img6.png" alt="ni slike"></li>

+	<li>Računalnik Student, odpri datoteko interfaces ( nano /etc/network/interfaces ), ter nastavi IP. <br>  <img src="../images/img7.png" alt="ni slike"></li>

+	<h2>Kako se uporablja <strong>nano</strong> urejavalnika besedila: </h2>

 	<p>

-	   1.) Urejvalnik nano odpremo z ukazom nano, kateremu sledi ime datoteke. Primer: <strong>nano /etc/mojadatoteka</strong>.  Če datoteka ne obstaja jo bo ustvaril urejevalnik. <br />

-	   2.) Po urejevalniku se premikamo s smernimi puščicami, brišemo z tipko <strong>backspace</strong>. <br />

+	   1.) Urejvalnik Nano odpremo z ukazom nano, kateremu sledi ime datoteke. Primer: <strong>nano /etc/mojadatoteka</strong>.  Če datoteka ne obstaja jo bo ustvaril urejevalnik. <br />

+	   2.) Po urejevalniku se premikamo s smernimi puščicami, brišemo s tipko <strong>backspace</strong>. <br />

 	   3.) Za shranjevanje dokumenta pritisnemo kombinacijo tipk <strong>ctrl</strong> + <strong>O</strong>  <br />

-	   4.) Za izhod iz urejevalnika pritisnemo kombinacijo tipk  <strong>ctrl</strong> + <strong>X</strong>. Pri tem nas urejevalnik upraša če želimo shraniti spremembe. Odgovorimo z <strong>y</strong> (yes, ja ) ali z <strong>n</strong> ( no, ne ).  <br />

-	   5.) Za izrez vrsticne uporabimo kombinacijo tipk <strong>ctrl</strong> + <strong>K</strong>. <br />

+	   4.) Za izhod iz urejevalnika pritisnemo kombinacijo tipk  <strong>ctrl</strong> + <strong>X</strong>. Pri tem nas urejevalnik upraša, če želimo shraniti spremembe. Odgovorimo z <strong>y</strong> (yes, ja ) ali z <strong>n</strong> ( no, ne ).  <br />

+	   5.) Za izrez vrstice uporabimo kombinacijo tipk <strong>ctrl</strong> + <strong>K</strong>. <br />

 	   6.) Za lepljenje vrstice se uporablja kombinacija tipk <strong>ctrl</strong> + <strong>U</strong>. <br />

 	   7.) Za iskanje po besedilu uporabimo kombinacijo tipk <strong>ctrl</strong> + <strong>W</strong>, nakar vnesemo iskani niz in pritisnemo tipko enter.

-	</p><br /> <img src="../images/img8.png" alt="ni slike"> </li>

+	</p><br />

+	<li>Kateri vmesnik (npr. eth0) spada pod kateri adapter (npr. Adapter1 ), lahko preverimo s strojnimi naslovi. Na računalniku zaženemo ukaz ifconfig, pogledamo HWaddr vrednost ter jo primerjamo z vrednostjo v Virtual-boxu (nastavitve => omrežja => adapter => MAC address <br /><img src="../images/slika4.png" alt="ni slike"/><img src="../images/slika3.png" alt="ni slike"/></li>

+	<li>Nato spremeni datoteko /etc/motd (z urejevalnikom nano, primer uporabe: "nano /etc/motd"), ter zamenjaj niz z ustreznim nizom kot to od tebe zahteva naloga ( npr. "Not for Human consumption" ) <br> 

+	<img src="../images/img8.png" alt="ni slike"> </li>

 	<li>Za testiranje se s testnim uporabniškim imenom prijavi na prvem računalniku. (SimpleArbiterDhcpGw) <br>  <img src="../images/img9.png" alt="ni slike"></li>

-	<li>Nato se preko ssh poveži na Student z uporabniškim imenom marjankoral19 - ssh marjankoral19@ip. <br>  <img src="../images/img10.png" alt="ni slike" ></li>

-	<li>Po uspešni prijavi se bo moralo izpisati motd sporočilo.</li>

+	<li>Nato se preko ssh poveži na računalnik Student z uporabniškim imenom marjankoral19 - ssh marjankoral19@ip. <br>  <img src="../images/img10.png" alt="ni slike" ></li>

+	<li>Po uspešni prijavi se bi moralo izpisati motd sporočilo.</li>

 	<li>Kpov_judge poženemo tako da se prijavimo na računalniku SimpleArbiterDhcpGw, najdemo datoteko test_task.py ter jo poženemo ( z ./test_task.py kot se poganjajo vse skripte )<br /> <img src="../images/img11.png" alt="ni slike"></li>

-	<li>Pojavi se nam okno kot ga vidimo zgoraj, nato pa pritisnemo Enter, vnesemo svoje uporabnisko ime ( npr. dr6784@student.uni-lj.si ), geslo, ime naloge (npr. 01-preparation-set_motd), vnesemo niz ki bi se nam moral prikazati, vnesemo ime uporabnika na racunalniku student (npr. marjankoral19) ter njegovo geslo, ip računalnika študent, nato pa po kratkem premoru dobimo rezultat. <img src="../images/img12.png" alt="ni slike"> 	</li>

+	<li>Pojavi se nam okno kot ga vidimo zgoraj, nato pa pritisnemo tipko Enter, vnesemo svoje uporabniško ime ( npr. dr6784@student.uni-lj.si ), geslo, ime naloge (npr. 01-preparation-set_motd), vnesemo niz ki bi se nam moral prikazati, vnesemo ime uporabnika na računalniku Student (npr. marjankoral19) ter njegovo geslo, ip računalnika študent, nato pa po kratkem premoru dobimo rezultat. <img src="../images/img12.png" alt="ni slike"> 	</li>

 </ol>

 

 </body>