mirror of
https://github.com/GNS3/gns3-server
synced 2024-11-24 17:28:08 +00:00
Use projects_path & images_path.
This commit is contained in:
parent
fb9f5d3c14
commit
182d2e465e
@ -72,4 +72,4 @@ class UploadHandler:
|
||||
@staticmethod
|
||||
def image_directory():
|
||||
server_config = Config.instance().get_section_config("Server")
|
||||
return os.path.expanduser(server_config.get("image_directory", "~/GNS3/images"))
|
||||
return os.path.expanduser(server_config.get("images_path", "~/GNS3/images"))
|
||||
|
@ -91,7 +91,8 @@ class Project:
|
||||
depending of the operating system
|
||||
"""
|
||||
|
||||
path = os.path.normpath(os.path.expanduser("~/GNS3/projects"))
|
||||
server_config = Config.instance().get_section_config("Server")
|
||||
path = os.path.expanduser(server_config.get("projects_path", "~/GNS3/projects"))
|
||||
try:
|
||||
os.makedirs(path, exist_ok=True)
|
||||
except OSError as e:
|
||||
|
@ -142,9 +142,11 @@ class Server:
|
||||
|
||||
@asyncio.coroutine
|
||||
def start_shell(self):
|
||||
from ptpython.repl import embed
|
||||
from gns3server.modules import Qemu
|
||||
|
||||
try:
|
||||
from ptpython.repl import embed
|
||||
except ImportError:
|
||||
log.error("Unable to start a shell: the ptpython module must be installed!")
|
||||
return
|
||||
yield from embed(globals(), locals(), return_asyncio_coroutine=True, patch_stdout=True)
|
||||
|
||||
def run(self):
|
||||
|
Loading…
Reference in New Issue
Block a user