From 62286aab57c3280a7c53abca1921a780ef0d69f5 Mon Sep 17 00:00:00 2001 From: "ma0178@student.uni-lj.si" Date: Wed, 7 Jan 2015 07:58:26 +0000 Subject: git-svn-id: https://svn.lusy.fri.uni-lj.si/kpov-public-svn/kpov-public@156 5cf9fbd1-b2bc-434c-b4b7-e852f4f63414 --- kpov_judge/tasks/radius_mysql_pam/task.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'kpov_judge/tasks/radius_mysql_pam') 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 -- cgit v1.2.1