From 21d9d968c4d324ab16972636171ad7f3530b36b6 Mon Sep 17 00:00:00 2001 From: grossmj Date: Mon, 7 Aug 2023 20:44:37 +1000 Subject: [PATCH] Revert "Use truststore in appliance_manager.py instead" This reverts commit a2628042e881a2c00827f20bf190a358d52b6615. --- gns3server/controller/appliance_manager.py | 8 -------- gns3server/run.py | 7 +++++++ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/gns3server/controller/appliance_manager.py b/gns3server/controller/appliance_manager.py index 2ea4e559..76cadfbf 100644 --- a/gns3server/controller/appliance_manager.py +++ b/gns3server/controller/appliance_manager.py @@ -37,14 +37,6 @@ import logging log = logging.getLogger(__name__) -try: - import truststore - truststore.inject_into_ssl() - log.info("Using system certificate store for SSL connections") -except ImportError: - pass - - class ApplianceManager: """ Manages appliances diff --git a/gns3server/run.py b/gns3server/run.py index 9664b9d5..8f054e9f 100644 --- a/gns3server/run.py +++ b/gns3server/run.py @@ -32,6 +32,13 @@ import logging log = logging.getLogger(__name__) +try: + import truststore + truststore.inject_into_ssl() + log.info("Using system certificate store for SSL connections") +except ImportError: + pass + from gns3server.web.web_server import WebServer from gns3server.web.logger import init_logger from gns3server.version import __version__