From 001fd373437e17bbf57c5560ac5d26d94de29afa Mon Sep 17 00:00:00 2001
From: 233boy <onehack.ttt@gmail.com>
Date: Sun, 13 May 2018 14:19:33 +0800
Subject: [PATCH] [fix] ss config issues

---
 config/blocked_hosts/server/http_ss.json | 48 +++++++++++++++---------
 install.sh                               |  2 +-
 v2ray.sh                                 |  4 +-
 3 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/config/blocked_hosts/server/http_ss.json b/config/blocked_hosts/server/http_ss.json
index 0e2c462..bfe6842 100644
--- a/config/blocked_hosts/server/http_ss.json
+++ b/config/blocked_hosts/server/http_ss.json
@@ -20,25 +20,39 @@
         "streamSettings": {
             "network": "tcp",
             "tcpSettings": {
-              "header": {
-                "type": "http",
-                "response": {
-                  "version": "1.1",
-                  "status": "200",
-                  "reason": "OK",
-                  "headers": {
-                    "Content-encoding": ["gzip"],
-                    "Content-Type": ["text/html; charset=utf-8"],
-                    "Cache-Control": ["no-cache"],
-                    "Vary": ["Accept-Encoding"],
-                    "X-Frame-Options": ["deny"],
-                    "X-XSS-Protection": ["1; mode=block"],
-                    "X-content-type-options": ["nosniff"]
-                  }
+                "header": {
+                    "type": "http",
+                    "response": {
+                        "version": "1.1",
+                        "status": "200",
+                        "reason": "OK",
+                        "headers": {
+                            "Content-encoding": [
+                                "gzip"
+                            ],
+                            "Content-Type": [
+                                "text/html; charset=utf-8"
+                            ],
+                            "Cache-Control": [
+                                "no-cache"
+                            ],
+                            "Vary": [
+                                "Accept-Encoding"
+                            ],
+                            "X-Frame-Options": [
+                                "deny"
+                            ],
+                            "X-XSS-Protection": [
+                                "1; mode=block"
+                            ],
+                            "X-content-type-options": [
+                                "nosniff"
+                            ]
+                        }
+                    }
                 }
-              }
             }
-          }
+        }
     },
     "outbound": {
         "protocol": "freedom",
diff --git a/install.sh b/install.sh
index 2130c52..41d3515 100644
--- a/install.sh
+++ b/install.sh
@@ -1130,7 +1130,7 @@ config() {
 			sed -i "28s/6666/$ssport/; 30s/chacha20-ietf/$ssciphers/; 31s/233blog.com/$sspass/" $v2ray_server_config
 			;;
 		2)
-			sed -i "50s/6666/$ssport/; 52s/chacha20-ietf/$ssciphers/; 53s/233blog.com/$sspass/" $v2ray_server_config
+			sed -i "64s/6666/$ssport/; 66s/chacha20-ietf/$ssciphers/; 67s/233blog.com/$sspass/" $v2ray_server_config
 			;;
 		3 | 4)
 			sed -i "31s/6666/$ssport/; 33s/chacha20-ietf/$ssciphers/; 34s/233blog.com/$sspass/" $v2ray_server_config
diff --git a/v2ray.sh b/v2ray.sh
index bbc4302..45f1b51 100644
--- a/v2ray.sh
+++ b/v2ray.sh
@@ -10,7 +10,7 @@ none='\e[0m'
 # Root
 [[ $(id -u) != 0 ]] && echo -e " 哎呀……请使用 ${red}root ${none}用户运行 ${yellow}~(^_^) ${none}" && exit 1
 
-_version="v2.24"
+_version="v2.25"
 
 cmd="apt-get"
 
@@ -3132,7 +3132,7 @@ config() {
 			sed -i "28s/6666/$ssport/; 30s/chacha20-ietf/$ssciphers/; 31s/233blog.com/$sspass/" $v2ray_server_config
 			;;
 		2)
-			sed -i "50s/6666/$ssport/; 52s/chacha20-ietf/$ssciphers/; 53s/233blog.com/$sspass/" $v2ray_server_config
+			sed -i "64s/6666/$ssport/; 66s/chacha20-ietf/$ssciphers/; 67s/233blog.com/$sspass/" $v2ray_server_config
 			;;
 		3 | 4)
 			sed -i "31s/6666/$ssport/; 33s/chacha20-ietf/$ssciphers/; 34s/233blog.com/$sspass/" $v2ray_server_config