Popravljena angleška in slovenska navodila, dodana navodila za uporabo kpov_judge

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

7 files changed, 15 insertions, 8 deletions

diff --git a/kpov_judge/tasks/set_motd/howtos/en/index.html b/kpov_judge/tasks/set_motd/howtos/en/index.html
index 0b2b971..41c8b19 100644
--- a/kpov_judge/tasks/set_motd/howtos/en/index.html
+++ b/kpov_judge/tasks/set_motd/howtos/en/index.html
@@ -5,12 +5,16 @@
 	<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.

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

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

-	<li>In Student(student-console) create a new user, marjankoral19, with a custom password. <br>  <img src="../images/img6.png"></li>

-	<li>Set the IP address to Student, - you can also do this manualy (ip: 172.23.192.3) <br>  <img src="../images/img7.png"></li>

-	<li>Then edit the /etc/motd, file with the specified string. "Not for Human consumption" <br>  <img src="../images/img8.png"> </li>

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

+	<li>In Student(student-console) open interfaces file ( nano /etc/network/interfaces ) and set the IP <br>  <img src="../images/img7.png"></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" /><img src="../images/slika3.png" /></li>

+	<li>Then edit the /etc/motd, file with the specified string. (eg. "Not for Human consumption" ) <br>  <img src="../images/img8.png"> </li>

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

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

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

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

+	<li></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"></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"> 	</li>

 </ol></h2>

 =======

 

diff --git a/kpov_judge/tasks/set_motd/howtos/images/img11.png b/kpov_judge/tasks/set_motd/howtos/images/img11.png
new file mode 100644
index 0000000..f42e7b0
--- /dev/null
+++ b/kpov_judge/tasks/set_motd/howtos/images/img11.png
diff --git a/kpov_judge/tasks/set_motd/howtos/images/img12.png b/kpov_judge/tasks/set_motd/howtos/images/img12.png
new file mode 100644
index 0000000..73ffb65
--- /dev/null
+++ b/kpov_judge/tasks/set_motd/howtos/images/img12.png
diff --git a/kpov_judge/tasks/set_motd/howtos/images/img7.PNG b/kpov_judge/tasks/set_motd/howtos/images/img7.PNG
index 40ce63d..ef61212 100644
--- a/kpov_judge/tasks/set_motd/howtos/images/img7.PNG
+++ b/kpov_judge/tasks/set_motd/howtos/images/img7.PNG
diff --git a/kpov_judge/tasks/set_motd/howtos/images/slika3.png b/kpov_judge/tasks/set_motd/howtos/images/slika3.png
new file mode 100644
index 0000000..05ca178
--- /dev/null
+++ b/kpov_judge/tasks/set_motd/howtos/images/slika3.png
diff --git a/kpov_judge/tasks/set_motd/howtos/images/slika4.png b/kpov_judge/tasks/set_motd/howtos/images/slika4.png
new file mode 100644
index 0000000..b99df06
--- /dev/null
+++ b/kpov_judge/tasks/set_motd/howtos/images/slika4.png
diff --git a/kpov_judge/tasks/set_motd/howtos/si/index.html b/kpov_judge/tasks/set_motd/howtos/si/index.html
index e780145..1c779c0 100644
--- a/kpov_judge/tasks/set_motd/howtos/si/index.html
+++ b/kpov_judge/tasks/set_motd/howtos/si/index.html
@@ -7,12 +7,15 @@
 	<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"> <br> <img src="../images/img2.png"> <br> <img src="../images/img3.png"></li>

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

-	<li>Na računalniku Student(student-console) ustvari nov uporabnik marjankoral19, geslo določi sam. <br>  <img src="../images/img6.png"></li>

-	<li>Računalniku Student, določi IP naslov - lahko tudi ročno (ip: 172.23.192.3) <br>  <img src="../images/img7.png"></li>

-	<li>Nato spremeni datoteko /etc/motd, zamenjaj z ustreznim nizom "Not for Human consumption" <br>  <img src="../images/img8.png"> </li>

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

+	<li>Računalnik Student, odpri datoteko interfaces ( nano /etc/network/interfaces ) ter nastavi IP <br>  <img src="../images/img7.png"></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" /><img src="../images/slika3.png" /></li>

+	<li>Nato spremeni datoteko /etc/motd, zamenjaj z ustreznim nizom kot od tebe zahteva naloga ( npr. "Not for Human consumption" ) <br>  <img src="../images/img8.png"> </li>

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

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

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

 	<li>Po uspešni prijavi se bo 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"></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"> 	</li>

 </ol></h2>

 =======