git://git.onelab.eu
/
nodemanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add chkconfig line in vinit in case it could help with systemd
[nodemanager.git]
/
controller.py
diff --git
a/controller.py
b/controller.py
index
ab8e521
..
c66ddff
100644
(file)
--- a/
controller.py
+++ b/
controller.py
@@
-1,16
+1,15
@@
-# $Id$
-# $URL$
-
-"""Delegate accounts are used to provide secure access to the XMLRPC API.
+#
+"""Delegate accounts are used to provide secure access to the XMLRPC API.
They are normal Unix accounts with a shell that tunnels XMLRPC requests to the API server."""
They are normal Unix accounts with a shell that tunnels XMLRPC requests to the API server."""
-import accounts
-import logger
-import tools
from pwd import getpwnam
from grp import getgrnam
from pwd import getpwnam
from grp import getgrnam
-class Controller(accounts.Account):
+import logger
+import tools
+import account
+
+class Controller(account.Account):
SHELL = '/usr/bin/forward_api_calls' # tunneling shell
TYPE = 'controller.Controller'
SHELL = '/usr/bin/forward_api_calls' # tunneling shell
TYPE = 'controller.Controller'
@@
-26,7
+25,7
@@
class Controller(accounts.Account):
def is_running(self):
logger.verbose("controller: is_running: %s" % self.name)
return getpwnam(self.name)[6] == self.SHELL
def is_running(self):
logger.verbose("controller: is_running: %s" % self.name)
return getpwnam(self.name)[6] == self.SHELL
-
+
def add_shell(shell):
"""Add <shell> to /etc/shells if it's not already there."""
def add_shell(shell):
"""Add <shell> to /etc/shells if it's not already there."""