From 5a01682e4ffb5b754eb76394e8e7e5832127cec7 Mon Sep 17 00:00:00 2001
From: "mp4085@student.uni-lj.si"
 <mp4085@student.uni-lj.si@5cf9fbd1-b2bc-434c-b4b7-e852f4f63414>
Date: Sun, 1 Feb 2015 07:53:32 +0000
Subject: git-svn-id:
 https://svn.lusy.fri.uni-lj.si/kpov-public-svn/kpov-public@258
 5cf9fbd1-b2bc-434c-b4b7-e852f4f63414

---
 .../tasks/openvpn_simple_smb/howtos/en/index.html  | 97 +++++++++++++++-------
 1 file changed, 67 insertions(+), 30 deletions(-)

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 4040a3f..aba834e 100644
--- a/kpov_judge/tasks/openvpn_simple_smb/howtos/en/index.html
+++ b/kpov_judge/tasks/openvpn_simple_smb/howtos/en/index.html
@@ -8,7 +8,7 @@
 <strong><h1>OpenVPN and SMB task:</h1></strong>
 <p><strong><h2>Quick task:</h2></strong><br>
   Connect to VPN with OpenVPN. Enable access to files through NFS and copy them through SMB.</p>
-<p><strong><h2>Navodila:</h2></strong><br>
+<p><strong><h2>Instructions:</h2></strong><br>
   1. From Directory with images of virtual computers drag twice the picture SimpleArbiterVPN and VPNClient.<br>
   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.<br>
   3. On both set two network interface(NAT and Internal) and run them.<br>
@@ -25,37 +25,74 @@
 3. Create configuration file tap0.conf, which should contain (split by lines) "remote IP_OF_YOUR_VPN_SERVR", "dev tap0", "proto tcp-client", "secret vpnkljuc.key"<br>
 4. On OpenVPN server connect to <strong>openvpn --config /some_directory/somewhere/tap0.conf</strong><br/>
 <p>
-  <u><strong><em><h3>Second part: write a program, which converts the binary record 32-bit number in decimal.</h3></em></strong></u><br>
-  The task can be made in Java or Python. You can also write code in any text editor.</p>
-<p><br>
-  JAVA------<br>
-   1. With command nano bintodec3.java create and open empty program with text editor nano<br>
-   2. Write a program for converting 24-bit number in two's complement into a decimal shape<br>
-<img src="slike/bu6.png"><br><img src="slike/bu7.png"><br>
-   3. Click Ctrl+X, then Y and Enter, that the program is closed and stored.<br>
-   4. If you don't have it, install Java <strong>sudo apt-get install openjdk-6-jdk</strong><br><img src="slike/predvaja_clip_image003.gif"><br>
-   5. Compile  program <strong>javac bintodec3.java</strong><br>
-   6. You can run and test the program <strong>java bintodec3</strong>. On the standard input are entered 24-bit numbers in šhexadecimal format<br><img src="slike/bu9.png"><br></p>
-<p>PYTHON------<br>
-  1. With command nano bintodec3.py create and open empty program with text editor nano<br>
-  2. Write a program, which converts 24-bit number in two's complement into a decimal shape<br>
-<img src="slike/bu5.png"><br>
-  3. Click Ctrl+X, then Y and Enter, that the program is closed and stored.<br>
-  4. Start the program with command <strong>python bintodec3.py</strong><br><img src="slike/bu8.png"><br></p><br><br>
-
-  
-  <p>
-  <h3> Testing </h3>
-  1. You can start the test program with command ./run_test.py<br>
-  <img src="slike/s1.png"><br>
-  2. For "Upor. Ime" and "Geslo" write your username and password. (example.: "pz1234@student.uni-lj.si" and "geslo123")<br>
-  <img src="slike/s2.png"> <img src="slike/s3.png"> <br>
-  3. For the name of the task write XX.predvaja.<br>
-  4. When a program asks you for path, enter your path to program for converting. (example.: if you have a program bintodec3.py in the same map as program run_test.py, enter: ./bintodec3.py)<br>
-  5. When he asks you about IP address SimpleArbiterja, enter.<br>
-  6. If the program returns OK your task is finished.</p>
+
+  <u><strong><em><h3>Second part: Access to imenika /home/test/IME_IMENIKA over NFS</h3></em></strong></u>
+<p><h4><u><strong><em>Client settings:</em></strong></u></h4>
+   1. Using "sudo apt-get install nfs-kernel-server" we install nfs service<br>
+   2. Create a directory /home/test/IME_IMENIKA<br/>
+   3. To /etc/exports add line /home/test/bla IP_client
+   4. Use sudo exportfs -a to save
+   5. Restart service using "sudo service nfs-kernel-server start"
+<p><h4><u><strong><em>Client settings:</em></strong></u></h4>
+  1. Instal client for nfs with command "sudo apt-get install nfs-common"<br/>
+  2. Create mounting directory "sudo mkdir -p /mnt/nfs/home/test" and mount servers file "sudo mount IP_SERVER:/home/test"<br/>
+  3. For automatic mounting we add previous commands to /etc/fstab <br/>
+
+<p><h3><u><strong><em>How-to za uporabo kpov-judge za OpenVPN</em></strong></u></h3>
 
  </font>
+
+<hr>
+<p>
+howto: task_check(results, params):
+	Metoda dobi, kot prvi argument rezultat metode task(...), kot drugi pa
+	rezultat funkcije gen_params().
+
+	Vrne stevilo pridobljenih tock.
+
+
+howto: task(...):
+	Metoda prejme naslednje argumente:
+	- IP naslov VPN streznika
+	- DNS naslov VPN streznika
+	- IP naslov klienta 1
+	- DNS naslov klienta 1
+	- IP naslov klienta 2
+	- DNS naslov klienta 2
+
+	Vrne slovar rezultatov:
+	
+    	results['SimpleArbiter_is_VPN_set_up']		
+		pove ali je VPN streznik nastavljen
+
+    	results['SimpleArbiter_is_VPN_running']
+		pove ali je VPN streznik zagnan
+
+    	results['SimpleArbiter_ping_C1']
+		ping rezultati (streznik -> klient1)
+
+    	results['SimpleArbiter_ping_C2']
+		ping rezultati (streznik -> klient2)
+
+    	results['SimpleArbiter_nmap_results']
+		pove ali sta oba klienta povezana na pravi VPN streznik
+
+    	results['SimpleArbiter_dir_vpn_contents']
+		kljuc, ce se ta nahaja v ustreznem imeniku
+
+    	results['SimpleArbiter_nfs_access_control_list']
+		preveri ce NFS dovoljuje dostop do /home/test/IME_UPORABNIKA
+
+    	results['VPNClient1_ping_VPN_server']
+		ping rezultati (klient 1 -> strežnik)
+
+    	results['VPNClient2_ping_VPN_server']
+		ping rezultati (klient 2 -> strežnik)
+
+</p>
+
 </body>
 
 </html>
+
+</html>
-- 
cgit v1.2.1