NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-01-18 07:23:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Renames server.conf and server.ini to gns3_server.conf and gns3_server.ini respectively.

Browse Source
This commit is contained in:
grossmj 2015-03-10 11:00:32 -06:00
parent 03dfd177f9
commit 4c68fd0d52
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gns3server/config.py
View File

@ -53,15 +53,15 @@ class Config(object):
appname = "GNS3" appname = "GNS3"
# On windows, the configuration file location can be one of the following: # On windows, the configuration file location can be one of the following:
# 1: %APPDATA%/GNS3/server.ini # 1: %APPDATA%/GNS3/gns3_server.ini
# 2: %APPDATA%/GNS3.ini # 2: %APPDATA%/GNS3.ini
# 3: %COMMON_APPDATA%/GNS3/server.ini # 3: %COMMON_APPDATA%/GNS3/gns3_server.ini
# 4: %COMMON_APPDATA%/GNS3.ini # 4: %COMMON_APPDATA%/GNS3.ini
# 5: server.ini in the current working directory # 5: server.ini in the current working directory
appdata = os.path.expandvars("%APPDATA%") appdata = os.path.expandvars("%APPDATA%")
common_appdata = os.path.expandvars("%COMMON_APPDATA%") common_appdata = os.path.expandvars("%COMMON_APPDATA%")
filename = "server.ini" filename = "gns3_server.ini"
if self._files is None: if self._files is None:
self._files = [os.path.join(appdata, appname, filename), self._files = [os.path.join(appdata, appname, filename),
os.path.join(appdata, appname + ".ini"), os.path.join(appdata, appname + ".ini"),
@ -71,9 +71,9 @@ class Config(object):
else: else:
# On UNIX-like platforms, the configuration file location can be one of the following: # On UNIX-like platforms, the configuration file location can be one of the following:
# 1: $HOME/.config/GNS3/server.conf # 1: $HOME/.config/GNS3/gns3_server.conf
# 2: $HOME/.config/GNS3.conf # 2: $HOME/.config/GNS3.conf
# 3: /etc/xdg/GNS3/server.conf # 3: /etc/xdg/GNS3/gns3_server.conf
# 4: /etc/xdg/GNS3.conf # 4: /etc/xdg/GNS3.conf
# 5: server.conf in the current working directory # 5: server.conf in the current working directory
@ -82,7 +82,7 @@ class Config(object):
else: else:
appname = "GNS3" appname = "GNS3"
home = os.path.expanduser("~") home = os.path.expanduser("~")
filename = "server.conf" filename = "gns3_server.conf"
if self._files is None: if self._files is None:
self._files = [os.path.join(home, ".config", appname, filename), self._files = [os.path.join(home, ".config", appname, filename),
os.path.join(home, ".config", appname + ".conf"), os.path.join(home, ".config", appname + ".conf"),