summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorma0178@student.uni-lj.si <ma0178@student.uni-lj.si@5cf9fbd1-b2bc-434c-b4b7-e852f4f63414>2015-01-07 07:58:26 +0000
committerma0178@student.uni-lj.si <ma0178@student.uni-lj.si@5cf9fbd1-b2bc-434c-b4b7-e852f4f63414>2015-01-07 07:58:26 +0000
commit62286aab57c3280a7c53abca1921a780ef0d69f5 (patch)
tree9921f1eba1b565e652378a7c1ebe041855761a53
parent9f9d60d68269d64cfa998ab697dcf81851c5fc9d (diff)
git-svn-id: https://svn.lusy.fri.uni-lj.si/kpov-public-svn/kpov-public@156 5cf9fbd1-b2bc-434c-b4b7-e852f4f63414
-rw-r--r--kpov_judge/tasks/radius_mysql_pam/task.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/kpov_judge/tasks/radius_mysql_pam/task.py b/kpov_judge/tasks/radius_mysql_pam/task.py
index 55ae14e..8ac2dd7 100644
--- a/kpov_judge/tasks/radius_mysql_pam/task.py
+++ b/kpov_judge/tasks/radius_mysql_pam/task.py
@@ -8,7 +8,7 @@
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.
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 OpenRadius na RadiusServer. Na SimpleArbiter
+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 .
@@ -78,7 +78,9 @@ def task(IP_RS, RADIUS_SECRET, RADIUS_USERNAME, RADIUS_PASSWORD, MYSQL_ADMIN_USE
sR = pxssh.pxssh()
sR.login(IP_RS, peer_user, peer_passwd)
- results['Test_RadiusServer'] = sR.run('radtest RADIUS_USERNAME RADIUS_PASSWORD IP_RS 1812 RADIUS_SECRET')
+ results['Test_RadiusServer'] = sR.run('radtest {0} {1} {3} 1812 {4}'.format(
+ RADIUS_USERNAME, RADIUS_USERNAME,
+ RADIUS_PASSWORD, IP_RS, RADIUS_SECRET'))
return results