load 'user-config.json' first

set default obfs plugin 'tls1.0_session_auth_compatible'
zisedk · Dec 19, 2015 · 68a77dd · 68a77dd
1 parent 459b0c7
commit 68a77dd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/config.json b/config.json
@@ -9,7 +9,7 @@
     "method": "aes-256-cfb",
     "protocol": "auth_sha1_compatible",
     "protocol_param": "",
-    "obfs": "http_simple_compatible",
+    "obfs": "tls1.0_session_auth_compatible",
     "obfs_param": "",
     "redirect": "",
     "dns_ipv6": false,

diff --git a/shadowsocks/shell.py b/shadowsocks/shell.py
@@ -62,8 +62,14 @@ def print_shadowsocks():
         pass
     print('Shadowsocks %s' % version)
 
-
 def find_config():
+    config_path = 'user-config.json'
+    if os.path.exists(config_path):
+        return config_path
+    config_path = os.path.join(os.path.dirname(__file__), '../', 'user-config.json')
+    if os.path.exists(config_path):
+        return config_path
+
     config_path = 'config.json'
     if os.path.exists(config_path):
         return config_path