Switch to xray (test)

ed-asriyan · Nov 30, 2024 · e604d68 · e604d68
1 parent bc0435c
commit e604d68
Show file tree

Hide file tree

Showing 44 changed files with 364 additions and 995 deletions.
diff --git a/.github/workflows/CD-production.yml b/.github/workflows/CD-production.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         task:
-          - deploy_metrics
+          # - deploy_metrics
           - deploy_proxies
     with:
       tasks: ${{ matrix.task }}

diff --git a/config/hosts.example.yml b/config/hosts.example.yml
@@ -6,9 +6,9 @@ all:
       # linux user to connect to ssh to the server as
       ansible_user:
     proxy1:
-      # uuid of the shadowsocks server that should be deployed (from config/servers.yml)
+      # uuid of the xray server that should be deployed (from config/servers.yml)
       hosts_server_uuid:
-      # public domain or IP where shadowsocks should be deployed (if ssh and shadowsocks are on the same IP, it should be equal to config_servers[hosts_server_uuid].host value)
+      # public domain or IP where xray should be deployed (if ssh and xray are on the same IP, it should be equal to config_servers[hosts_server_uuid].host value)
       ansible_host:
       # linux user to connect to ssh to the server as
       ansible_user:

diff --git a/config/servers.example.yml b/config/servers.example.yml
@@ -1,55 +1,31 @@
 config_servers:
   server1-uuid:
+    flow:
+    # private key. generate with ./xray x25519
+    private_key:
+    # public key. generate with ./xray x25519
+    public_key:
+    # where regular https requests proxy to
+    sni:
     # domain of server that will be put into config
     host:
     # description or name of server
     remarks:
     # port of shadowsocks to be exposed and used publicly
     port:
-    # cipher to use in shadowsocks
-    method:
-    # secret (any random string) to be used for generating client passwords
-    secret:
-    # prefix to use. read more: https://www.reddit.com/r/outlinevpn/wiki/index/prefixing
-    prefix:
-    # where regular https requests (non-shadowsocks requests) proxy to
-    fallback_proxy_target:
-    # if you don't want to install prometheus on the server, replace yaml object to boolean false:
-    # prometheus_metrics: false
-    prometheus_metrics:
-      # port where prometheus metrics endpoints should be exposed
-      port:
-      # content of self-signed cert and keys (SSL pem format)
-      tls:
-        certificate: |
-            -----BEGIN CERTIFICATE-----
-            ....
-            -----END CERTIFICATE-----
-        key: |
-            -----BEGIN PRIVATE KEY-----
-            ....
-            -----END PRIVATE KEY-----
-      shadowsocks:
-        # any random URL-valid string starting with "/"
-        url_path:
-      node_exporter:
-        # any random URL-valid string starting with "/"
-        url_path:
+
   # second server (for instance)
   server2-uuid:
+    flow:
+    # private key. generate with ./xray x25519
+    private_key:
+    # public key. generate with ./xray x25519
+    public_key:
+    # where regular https requests proxy to
+    sni:
+    # domain of server that will be put into config
     host:
+    # description or name of server
     remarks:
-    port:
-    method:
-    secret:
-    prefix:
-    fallback_proxy_target:
-    prometheus_metrics:
-      port:
-      tls:
-        certificate_path:
-        key_path:
-      shadowsocks:
-        url_path:
-      node_exporter:
-        url_path:
+    # port of shadowsocks to be exposed and used publicly
+    port:
diff --git a/proxies.yml b/proxies.yml
@@ -5,8 +5,8 @@
     - ./config/users.yml
     - ./config/servers.yml
   roles:
-    - role: shadowsocks-gateway
+    - role: xray
       vars:
-        shadowsocks_gateway_server_uuid: "{{ hosts_server_uuid }}"
-        shadowsocks_gateway_server: "{{ config_servers[shadowsocks_gateway_server_uuid] }}"
-        shadowsocks_gateway_users: "{{ config_users }}"
+        xray_server_uuid: "{{ hosts_server_uuid }}"
+        xray_server: "{{ config_servers[xray_server_uuid] }}"
+        xray_users: "{{ config_users }}"
diff --git a/roles/nginx/README.md b/roles/nginx/README.md
diff --git a/roles/nginx/tasks/main.yml b/roles/nginx/tasks/main.yml
diff --git a/roles/node-exporter/README.md b/roles/node-exporter/README.md
diff --git a/roles/node-exporter/defaults/main.yml b/roles/node-exporter/defaults/main.yml
diff --git a/roles/node-exporter/tasks/main.yml b/roles/node-exporter/tasks/main.yml
diff --git a/roles/node-exporter/templates/node_exporter.service.j2 b/roles/node-exporter/templates/node_exporter.service.j2
diff --git a/roles/node-exporter/vars/main.yml b/roles/node-exporter/vars/main.yml
diff --git a/roles/prometheus/README.md b/roles/prometheus/README.md
diff --git a/roles/prometheus/defaults/main.yml b/roles/prometheus/defaults/main.yml