git://git.onelab.eu
/
plcrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replace syncadmins.sh with syncadmins.py
[plcrt.git]
/
cron.d
/
syncadmins.py
diff --git
a/callplcsh.py
b/cron.d/syncadmins.py
old mode 100644
(file)
new mode 100755
(executable)
similarity index 68%
rename from
callplcsh.py
rename to
cron.d/syncadmins.py
index
6d18625
..
7490496
--- a/
callplcsh.py
+++ b/
cron.d/syncadmins.py
@@
-7,7
+7,6
@@
import sys
try:
# if this file deos not exist, then we will jump to the exception and use
# the local PLCSH without passing any additional arguments.
try:
# if this file deos not exist, then we will jump to the exception and use
# the local PLCSH without passing any additional arguments.
-
os.stat("/etc/planetlab/master.py")
sys.path.append("/etc/planetlab")
import master
os.stat("/etc/planetlab/master.py")
sys.path.append("/etc/planetlab")
import master
@@
-15,15
+14,15
@@
try:
# Use the values given to us in the /etc/planetlab/master.py file taken from
# the master PLC and use them to construct the proper arguments to plcsh so
# that we can get a user list from managing, CoPLC
# Use the values given to us in the /etc/planetlab/master.py file taken from
# the master PLC and use them to construct the proper arguments to plcsh so
# that we can get a user list from managing, CoPLC
-
user=master.PLC_ROOT_USER
passwd=master.PLC_ROOT_PASSWORD
url = "https://" + master.PLC_API_HOST + ":" \
+ master.PLC_API_PORT + master.PLC_API_PATH
user=master.PLC_ROOT_USER
passwd=master.PLC_ROOT_PASSWORD
url = "https://" + master.PLC_API_HOST + ":" \
+ master.PLC_API_PORT + master.PLC_API_PATH
- cmd = "plcsh --user=%s --password=%s --url=%s %s" % (user,
- passwd, url, " ".join(sys.argv[1:]))
+ plcsh_args = "--user=%s --password=%s --url=%s %s" % (user, passwd, url, " ".join(sys.argv[1:]))
except:
except:
-
cmd = "plcsh
%s" % " ".join(sys.argv[1:])
+
plcsh_args = "
%s" % " ".join(sys.argv[1:])
-os.system(cmd)
+dir = "/usr/share/plcrt"
+os.system("chmod 755 %s/getpersons.py" % dir)
+os.system("%s/getpersons.py %s -- admin | %s/adduserstort.pl priv -" % ( dir, plcsh_args, dir) )