From decf5da1c210e152c1b66ebb1344c7652ae0286c Mon Sep 17 00:00:00 2001
From: dnomd343 <i@343.re>
Date: Sat, 25 Sep 2021 11:36:44 +0800
Subject: [PATCH] refactor: new file structure

---
 Dockerfile |  2 +-
 load.sh    | 80 ++++++++++++++++++++++++++----------------------------
 2 files changed, 39 insertions(+), 43 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index dfc8d49..696ecc6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ COPY --from=asset /tmp/asset/ /etc/xray/asset/
 COPY --from=asset /tmp/xray/xray /usr/bin/
 ENV XRAY_LOCATION_ASSET=/etc/xray/asset
 RUN apk --update add --no-cache iptables ip6tables && \
-    mkdir -p /etc/xray/conf && \
+    mkdir -p /etc/xray/config && \
     mkdir -p /etc/xray/expose/log && \
     mkdir -p /etc/xray/expose/segment && \
     mv /etc/xray/tproxy.sh /
diff --git a/load.sh b/load.sh
index a0d136e..1241da4 100755
--- a/load.sh
+++ b/load.sh
@@ -1,20 +1,35 @@
 XRAY_DIR="/etc/xray"
 LOG_DIR="$XRAY_DIR/expose/log"
+CONFIG_DIR="$XRAY_DIR/expose/config"
+
+load_log(){
+log_level=`cat $LOG_DIR/level`
+legal=false
+[ "$log_level" == "debug" ] && legal=true
+[ "$log_level" == "info" ] && legal=true
+[ "$log_level" == "warning" ] && legal=true
+[ "$log_level" == "error" ] && legal=true
+[ "$log_level" == "none" ] && legal=true
+[ "$legal" == false ] && log_level="warning"
+cat>$XRAY_DIR/config/log.json<<EOF
+{
+  "log": {
+    "loglevel": "$log_level",
+    "access": "$LOG_DIR/access.log",
+    "error": "$LOG_DIR/error.log"
+  }
+}
+EOF
+}
+
 load_inbounds(){
-cat>$XRAY_DIR/conf/inbounds.json<<EOF
+cat>$XRAY_DIR/config/inbounds.json<<EOF
 {
   "inbounds": [
     {
       "tag": "tproxy",
       "port": 7288,
       "protocol": "dokodemo-door",
-      "sniffing": {
-        "enabled": true,
-        "destOverride": [
-          "http",
-          "tls"
-        ]
-      },
       "settings": {
         "network": "tcp,udp",
         "followRedirect": true
@@ -82,28 +97,8 @@ cat>$XRAY_DIR/conf/inbounds.json<<EOF
 EOF
 }
 
-load_log(){
-log_level=`cat $LOG_DIR/level`
-legal=false
-[ "$log_level" == "debug" ] && legal=true
-[ "$log_level" == "info" ] && legal=true
-[ "$log_level" == "warning" ] && legal=true
-[ "$log_level" == "error" ] && legal=true
-[ "$log_level" == "none" ] && legal=true
-[ "$legal" == false ] && log_level="warning"
-cat>$XRAY_DIR/conf/log.json<<EOF
-{
-  "log": {
-    "loglevel": "$log_level",
-    "access": "$LOG_DIR/access.log",
-    "error": "$LOG_DIR/error.log" 
-  }
-}
-EOF
-}
-
 load_outbounds(){
-cat>$XRAY_DIR/expose/outbounds.json<<EOF
+cat>$CONFIG_DIR/outbounds.json<<EOF
 {
   "outbounds": [
     {
@@ -116,10 +111,10 @@ EOF
 }
 
 load_routing(){
-cat>$XRAY_DIR/expose/routing.json<<EOF
+cat>$CONFIG_DIR/routing.json<<EOF
 {
   "routing": {
-    "domainStrategy": "IPIfNonMatch",
+    "domainStrategy": "AsIs",
     "rules": [
       {
         "type": "field",
@@ -141,12 +136,11 @@ EOF
 
 
 load_dns(){
-cat>$XRAY_DIR/expose/dns.json<<EOF
+cat>$CONFIG_DIR/dns.json<<EOF
 {
   "dns": {
     "servers": [
-      "223.5.5.5",
-      "119.29.29.29"
+      "localhost"
     ]
   }
 }
@@ -170,18 +164,20 @@ FF00::/8
 EOF
 }
 
-mkdir -p $XRAY_DIR/conf
+mkdir -p $XRAY_DIR/config
 mkdir -p $XRAY_DIR/expose/segment
 mkdir -p $LOG_DIR
+mkdir -p $CONFIG_DIR
+
 [ ! -s "$LOG_DIR/access.log" ] && touch $LOG_DIR/access.log
 [ ! -s "$LOG_DIR/error.log" ] && touch $LOG_DIR/error.log
-load_inbounds
+
 load_log
-[ ! -s "$XRAY_DIR/expose/outbounds.json" ] && load_outbounds
-[ ! -s "$XRAY_DIR/expose/routing.json" ] && load_routing
-[ ! -s "$XRAY_DIR/expose/dns.json" ] && load_dns
-cp $XRAY_DIR/expose/outbounds.json $XRAY_DIR/conf/
-cp $XRAY_DIR/expose/routing.json $XRAY_DIR/conf/
-cp $XRAY_DIR/expose/dns.json $XRAY_DIR/conf/
+load_inbounds
+[ ! -s "$CONFIG_DIR/outbounds.json" ] && load_outbounds
+[ ! -s "$CONFIG_DIR/routing.json" ] && load_routing
+[ ! -s "$CONFIG_DIR/dns.json" ] && load_dns
+cp $CONFIG_DIR/*.json $XRAY_DIR/config/
+
 [ ! -s "$XRAY_DIR/expose/segment/ipv4" ] && load_ipv4
 [ ! -s "$XRAY_DIR/expose/segment/ipv6" ] && load_ipv6