From 3cc1938bf94a5cd52a223f63133773f83e811b4b Mon Sep 17 00:00:00 2001
From: Teddysun <i@teddysun.com>
Date: Sun, 4 Dec 2016 16:42:06 +0900
Subject: [PATCH] update config files

---
 shadowsocks           | 6 +++++-
 shadowsocks-debian    | 6 +++++-
 shadowsocks-go        | 6 +++++-
 shadowsocks-go-debian | 6 +++++-
 shadowsocksR          | 6 +++++-
 shadowsocksR-debian   | 6 +++++-
 6 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/shadowsocks b/shadowsocks
index 8999961..b1a0e19 100644
--- a/shadowsocks
+++ b/shadowsocks
@@ -20,7 +20,11 @@ elif [ -f /usr/local/bin/ssserver ]; then
     BIN=/usr/local/bin/ssserver
 fi
 NAME=Shadowsocks
-CONF=/etc/shadowsocks.json
+if [ -f /etc/shadowsocks-python/config.json ]; then
+    CONF=/etc/shadowsocks-python/config.json
+elif [ -f /etc/shadowsocks.json ]; then
+    CONF=/etc/shadowsocks.json
+fi
 RETVAL=0
 
 check_running(){
diff --git a/shadowsocks-debian b/shadowsocks-debian
index 616e225..5079efe 100644
--- a/shadowsocks-debian
+++ b/shadowsocks-debian
@@ -18,7 +18,11 @@ elif [ -f /usr/local/bin/ssserver ]; then
     BIN=/usr/local/bin/ssserver
 fi
 NAME=Shadowsocks
-CONF=/etc/shadowsocks.json
+if [ -f /etc/shadowsocks-python/config.json ]; then
+    CONF=/etc/shadowsocks-python/config.json
+elif [ -f /etc/shadowsocks.json ]; then
+    CONF=/etc/shadowsocks.json
+fi
 RETVAL=0
 
 check_running(){
diff --git a/shadowsocks-go b/shadowsocks-go
index d5bd4de..b2eadd1 100644
--- a/shadowsocks-go
+++ b/shadowsocks-go
@@ -22,7 +22,11 @@
 
 NAME=Shadowsocks-go
 BIN=/usr/bin/shadowsocks-server
-CONF=/etc/shadowsocks/config.json
+if [ -f /etc/shadowsocks-go/config.json ]; then
+    CONF=/etc/shadowsocks-go/config.json
+elif [ -f /etc/shadowsocks/config.json ]; then
+    CONF=/etc/shadowsocks/config.json
+fi
 PID_DIR=/var/run
 PID_FILE=$PID_DIR/shadowsocks-go.pid
 RET_VAL=0
diff --git a/shadowsocks-go-debian b/shadowsocks-go-debian
index 2d4e2bc..efcf413 100644
--- a/shadowsocks-go-debian
+++ b/shadowsocks-go-debian
@@ -14,7 +14,11 @@
 
 NAME=Shadowsocks-go
 BIN=/usr/bin/shadowsocks-server
-CONF=/etc/shadowsocks/config.json
+if [ -f /etc/shadowsocks-go/config.json ]; then
+    CONF=/etc/shadowsocks-go/config.json
+elif [ -f /etc/shadowsocks/config.json ]; then
+    CONF=/etc/shadowsocks/config.json
+fi
 PID_DIR=/var/run
 PID_FILE=$PID_DIR/shadowsocks-go.pid
 RET_VAL=0
diff --git a/shadowsocksR b/shadowsocksR
index 76ff097..0647108 100644
--- a/shadowsocksR
+++ b/shadowsocksR
@@ -16,7 +16,11 @@
 
 NAME=ShadowsocksR
 BIN=/usr/local/shadowsocks/server.py
-CONF=/etc/shadowsocks.json
+if [ -f /etc/shadowsocks-r/config.json ]; then
+    CONF=/etc/shadowsocks-r/config.json
+elif [ -f /etc/shadowsocks.json ]; then
+    CONF=/etc/shadowsocks.json
+fi
 RETVAL=0
 
 check_running(){
diff --git a/shadowsocksR-debian b/shadowsocksR-debian
index 539df7b..ecfcff3 100644
--- a/shadowsocksR-debian
+++ b/shadowsocksR-debian
@@ -14,7 +14,11 @@
 
 NAME=ShadowsocksR
 BIN=/usr/local/shadowsocks/server.py
-CONF=/etc/shadowsocks.json
+if [ -f /etc/shadowsocks-r/config.json ]; then
+    CONF=/etc/shadowsocks-r/config.json
+elif [ -f /etc/shadowsocks.json ]; then
+    CONF=/etc/shadowsocks.json
+fi
 RETVAL=0
 
 check_running(){