git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
creating tag sfa-0.9-11
[sfa.git]
/
sfa
/
server
/
sfa-server.py
diff --git
a/sfa/server/sfa-server.py
b/sfa/server/sfa-server.py
index
58bfdb9
..
5e0905f
100755
(executable)
--- a/
sfa/server/sfa-server.py
+++ b/
sfa/server/sfa-server.py
@@
-150,12
+150,12
@@
def init_server(options, config):
manager.init_server()
manager.init_server()
-def sync_interfaces():
+def sync_interfaces(
server_key_file, server_cert_file
):
"""
Attempt to install missing trusted gids and db records for
our federated interfaces
"""
"""
Attempt to install missing trusted gids and db records for
our federated interfaces
"""
- api = SfaAPI()
+ api = SfaAPI(
key_file = server_key_file, cert_file = server_cert_file
)
registries = Registries(api)
aggregates = Aggregates(api)
registries.sync_interfaces()
registries = Registries(api)
aggregates = Aggregates(api)
registries.sync_interfaces()
@@
-185,7
+185,6
@@
def main():
help="Run as daemon.", default=False)
(options, args) = parser.parse_args()
help="Run as daemon.", default=False)
(options, args) = parser.parse_args()
- if (options.daemon): daemon()
config = Config()
hierarchy = Hierarchy()
config = Config()
hierarchy = Hierarchy()
@@
-194,8
+193,9
@@
def main():
init_server_key(server_key_file, server_cert_file, config, hierarchy)
init_server(options, config)
init_server_key(server_key_file, server_cert_file, config, hierarchy)
init_server(options, config)
- sync_interfaces()
+ sync_interfaces(
server_key_file, server_cert_file
)
+ if (options.daemon): daemon()
# start registry server
if (options.registry):
from sfa.server.registry import Registry
# start registry server
if (options.registry):
from sfa.server.registry import Registry