mirror of
https://github.com/GNS3/gns3-server.git
synced 2025-01-18 23:43:48 +02:00
Revert "Use truststore in appliance_manager.py instead"
This reverts commit a2628042e8
.
This commit is contained in:
parent
945a2c98cd
commit
21d9d968c4
@ -37,14 +37,6 @@ import logging
|
|||||||
log = logging.getLogger(__name__)
|
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:
|
class ApplianceManager:
|
||||||
"""
|
"""
|
||||||
Manages appliances
|
Manages appliances
|
||||||
|
@ -32,6 +32,13 @@ import logging
|
|||||||
log = logging.getLogger(__name__)
|
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.web_server import WebServer
|
||||||
from gns3server.web.logger import init_logger
|
from gns3server.web.logger import init_logger
|
||||||
from gns3server.version import __version__
|
from gns3server.version import __version__
|
||||||
|
Loading…
Reference in New Issue
Block a user