From d18423ee8c158805fb271f7777188f831cc3e070 Mon Sep 17 00:00:00 2001
From: Cyril Anisimov <cyan84@gmail.com>
Date: Mon, 12 Aug 2024 09:27:52 +0200
Subject: [PATCH] Feature/xray custom port (#965)

* add variable port to scripts for xray

* update naming
---
 client/core/controllers/serverController.cpp      | 1 +
 client/server_scripts/xray/configure_container.sh | 4 ++--
 client/server_scripts/xray/run_container.sh       | 2 +-
 client/server_scripts/xray/template.json          | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/client/core/controllers/serverController.cpp b/client/core/controllers/serverController.cpp
index 11efb57a..233d66d4 100644
--- a/client/core/controllers/serverController.cpp
+++ b/client/core/controllers/serverController.cpp
@@ -569,6 +569,7 @@ ServerController::Vars ServerController::genVarsForScript(const ServerCredential
 
     // Xray vars
     vars.append({ { "$XRAY_SITE_NAME", xrayConfig.value(config_key::site).toString(protocols::xray::defaultSite) } });
+    vars.append({ { "$XRAY_SERVER_PORT", xrayConfig.value(config_key::port).toString(protocols::xray::defaultPort) } });
 
     // Wireguard vars
     vars.append({ { "$WIREGUARD_SUBNET_IP",
diff --git a/client/server_scripts/xray/configure_container.sh b/client/server_scripts/xray/configure_container.sh
index 541e155b..bf6f4a42 100644
--- a/client/server_scripts/xray/configure_container.sh
+++ b/client/server_scripts/xray/configure_container.sh
@@ -29,7 +29,7 @@ cat > /opt/amnezia/xray/server.json <<EOF
     },
     "inbounds": [
         {
-            "port": 443,
+            "port": "$XRAY_SERVER_PORT",
             "protocol": "vless",
             "settings": {
                 "clients": [
@@ -44,7 +44,7 @@ cat > /opt/amnezia/xray/server.json <<EOF
                 "network": "tcp",
                 "security": "reality",
                 "realitySettings": {
-                    "dest": "$XRAY_SITE_NAME:443",
+                    "dest": "$XRAY_SITE_NAME:$XRAY_SERVER_PORT",
                     "serverNames": [
                         "$XRAY_SITE_NAME"
                     ],
diff --git a/client/server_scripts/xray/run_container.sh b/client/server_scripts/xray/run_container.sh
index e76c505a..bd00b992 100644
--- a/client/server_scripts/xray/run_container.sh
+++ b/client/server_scripts/xray/run_container.sh
@@ -4,7 +4,7 @@ sudo docker run -d \
 --log-driver none \
 --restart always \
 --cap-add=NET_ADMIN \
--p 443:443/tcp \
+-p $XRAY_SERVER_PORT:$XRAY_SERVER_PORT/tcp \
 --name $CONTAINER_NAME $CONTAINER_NAME
 
 sudo docker network connect amnezia-dns-net $CONTAINER_NAME
diff --git a/client/server_scripts/xray/template.json b/client/server_scripts/xray/template.json
index a4d09872..efc4a137 100644
--- a/client/server_scripts/xray/template.json
+++ b/client/server_scripts/xray/template.json
@@ -19,7 +19,7 @@
                 "vnext": [
                     {
                         "address": "$SERVER_IP_ADDRESS",
-                        "port": 443,
+                        "port": "$XRAY_SERVER_PORT",
                         "users": [
                             {
                                 "id": "$XRAY_CLIENT_ID",