X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fserver%2Fsfa-server.py;h=5e0905f0828aaa9cc801c0ed9000c6e3439b8b9e;hb=f3d825457ff4881b8c9658967f8ed159a01dfcaa;hp=58bfdb9c37803bcb49e1e3ea81cfd48bffe44074;hpb=b55a7407c2efd19af26c8165a56435ad5fc50389;p=sfa.git diff --git a/sfa/server/sfa-server.py b/sfa/server/sfa-server.py index 58bfdb9c..5e0905f0 100755 --- a/sfa/server/sfa-server.py +++ b/sfa/server/sfa-server.py @@ -150,12 +150,12 @@ def init_server(options, config): 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 """ - api = SfaAPI() + api = SfaAPI(key_file = server_key_file, cert_file = server_cert_file) 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() - if (options.daemon): daemon() 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) - 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