From 4c68fd0d52c7691e45c5c1a3498e66b9797cbcfa Mon Sep 17 00:00:00 2001 From: grossmj Date: Tue, 10 Mar 2015 11:00:32 -0600 Subject: [PATCH] Renames server.conf and server.ini to gns3_server.conf and gns3_server.ini respectively. --- gns3server/config.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gns3server/config.py b/gns3server/config.py index 4b8f4241..657ac67b 100644 --- a/gns3server/config.py +++ b/gns3server/config.py @@ -53,15 +53,15 @@ class Config(object): appname = "GNS3" # 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 - # 3: %COMMON_APPDATA%/GNS3/server.ini + # 3: %COMMON_APPDATA%/GNS3/gns3_server.ini # 4: %COMMON_APPDATA%/GNS3.ini # 5: server.ini in the current working directory appdata = os.path.expandvars("%APPDATA%") common_appdata = os.path.expandvars("%COMMON_APPDATA%") - filename = "server.ini" + filename = "gns3_server.ini" if self._files is None: self._files = [os.path.join(appdata, appname, filename), os.path.join(appdata, appname + ".ini"), @@ -71,9 +71,9 @@ class Config(object): else: # 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 - # 3: /etc/xdg/GNS3/server.conf + # 3: /etc/xdg/GNS3/gns3_server.conf # 4: /etc/xdg/GNS3.conf # 5: server.conf in the current working directory @@ -82,7 +82,7 @@ class Config(object): else: appname = "GNS3" home = os.path.expanduser("~") - filename = "server.conf" + filename = "gns3_server.conf" if self._files is None: self._files = [os.path.join(home, ".config", appname, filename), os.path.join(home, ".config", appname + ".conf"),