From ec8c1199df5b33e853254f400c8b5e8d5f7d1226 Mon Sep 17 00:00:00 2001 From: chn Date: Sun, 16 Nov 2025 11:10:41 +0800 Subject: [PATCH] devices.srv1/srv2: run separate xray client --- devices/srv1/default.nix | 1 + devices/srv1/node0/default.nix | 1 - devices/srv1/node1/default.nix | 3 +-- devices/srv1/node1/secrets.yaml | 6 ++++-- devices/srv1/node2/default.nix | 3 +-- devices/srv2/default.nix | 1 + devices/srv2/node0/default.nix | 1 - devices/srv2/node1/default.nix | 5 +---- devices/srv2/node1/secrets.yaml | 6 ++++-- devices/srv2/node2/default.nix | 5 +---- devices/srv2/node2/secrets.yaml | 6 ++++-- devices/vps4/secrets.yaml | 10 ++++++++-- devices/vps6/secrets.yaml | 10 ++++++++-- devices/vps9/secrets.yaml | 10 ++++++++-- 14 files changed, 42 insertions(+), 26 deletions(-) diff --git a/devices/srv1/default.nix b/devices/srv1/default.nix index a22082dc..095a9329 100644 --- a/devices/srv1/default.nix +++ b/devices/srv1/default.nix @@ -60,6 +60,7 @@ inputs: ]; }; mariadb.mountFrom = "nodatacow"; + xray.client = {}; }; packages.vasp = {}; user.users = [ "chn" "xll" "zem" "yjq" "gb" "wp" "hjp" "wm" "GROUPIII-1" "GROUPIII-2" "GROUPIII-3" "zgq" ]; diff --git a/devices/srv1/node0/default.nix b/devices/srv1/node0/default.nix index b4dfadf0..274a1b86 100644 --- a/devices/srv1/node0/default.nix +++ b/devices/srv1/node0/default.nix @@ -22,7 +22,6 @@ inputs: services = { sshd.motd = true; - xray.client.dnsmasq.extraInterfaces = [ "eno146" ]; beesd."/" = { hashTableSizeMB = 128; threads = 4; }; xrdp = { enable = true; hostname = [ "srv1.chn.moe" ]; }; samba = { hostsAllowed = ""; shares = { home.path = "/home"; root.path = "/"; }; }; diff --git a/devices/srv1/node1/default.nix b/devices/srv1/node1/default.nix index 11939478..eb66c37a 100644 --- a/devices/srv1/node1/default.nix +++ b/devices/srv1/node1/default.nix @@ -9,8 +9,7 @@ inputs: nixpkgs.march = "broadwell"; network.settings = { - static.eno2 = - { ip = "192.168.178.2"; mask = 24; gateway = "192.168.178.1"; dns = "192.168.178.1"; }; + static.eno2 = { ip = "192.168.178.2"; mask = 24; gateway = "192.168.178.1"; }; trust = [ "eno2" ]; }; }; diff --git a/devices/srv1/node1/secrets.yaml b/devices/srv1/node1/secrets.yaml index 022fc379..dfa61727 100644 --- a/devices/srv1/node1/secrets.yaml +++ b/devices/srv1/node1/secrets.yaml @@ -1,4 +1,6 @@ tinc: ENC[AES256_GCM,data:s/mcjWKxEp8f6OgAUqkHg8IHA/coBtht20pqSdwGp9OBRta64xyzszeS6o8uW1cV65vm1qQR9XkC7nmBx7F9RAZpMwEYh3anAfzWvL1dd6nNl9NLaz9eqrRGJJH4lyMAmErQRF6epEe2Z0kfs3icsZJ3p8rmWSHjIETFR+pQvepTzLXfz7mi3EftqFxK6o5LXe6t2df7PD5q7x8loB7eu4Qyh14NrklgMifmGoNBsGdIBAiqbZ+3xMt2VgEk4wc7X2ZmBJFx19U=,iv:343e5eRAGxwhb4ITadyKJOcvCnLp5emgz737kBmYlig=,tag:O/cwMZJofSKxMhzFMBV+Mg==,type:str] +xray-client: + uuid: ENC[AES256_GCM,data:UxZlTqBDV5K3ywwERYYmW3ymTnioFQ7XS22I8ab5mdeI1TnD,iv:YR+07MWd5E97lz5iwMWjBLhd1tP0okhnodnmbWCVWxo=,tag:97EOKuBMdEm3ffdQuphMww==,type:str] sops: age: - recipient: age19ax6vm3pv8rph5tq3mmehd9sy9jk823tw8svsd790r0lkslycquqvlwz9m @@ -19,7 +21,7 @@ sops: cWpEMWU1TjZKbnFTWm4xY2QwdWx3aFkK0O6p2piq8RKOcSTT49i0pnlt+gOk+QMF r+EJU0zobWwe3PrDg8jjw5HpMxrpDzHcD0XMnVQW0Fd9pn6n4VfpUw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-10-12T08:54:16Z" - mac: ENC[AES256_GCM,data:Vk9TJgMM41NhB9XEzBRNuUxZ+pIdFTS4/9VoeBjVB8nMtRb0ZmjB9CTmYGXGxFfB/dg63qmXGfQITgKmtANXiQpMHXYdHw1xnEOTtlTa/ndp3xszVxAEBBhsVlAiXSYmAxKFtIw6W2Erpz1cFhkC0XjlE8/EGe1Srbre0JCzbCA=,iv:pmd1ZM0nhDyNZ6eiNkFEDX5Z0XRSbg2fAPEW6EonsIU=,tag:YM7H+B/IdFVkD5f519FOAg==,type:str] + lastmodified: "2025-11-16T03:16:01Z" + mac: ENC[AES256_GCM,data:IRQxlKzSfCkAYESUDAgmkMAzhOiaqBBQC8ZniMKPM/11VlHGQpV89qB1NDSisdrCqFi9Iu4/iG6g6W/mc39x/V5MLdrQO9G3cGm568KWzh3rBZmD0wlkuCzQP1phFJpeLpg1BLWLn4i0nIWE/ER77pVtV/iA/vOWj0lmDb+GWvg=,iv:AmH3GJjPw9QMa+1utaXkqIfNuXI2qPXUrEVwPF3u1Io=,tag:fe2RiW1r2TAyftPcsuvowQ==,type:str] unencrypted_suffix: _unencrypted version: 3.10.2 diff --git a/devices/srv1/node2/default.nix b/devices/srv1/node2/default.nix index 1291614c..5b176465 100644 --- a/devices/srv1/node2/default.nix +++ b/devices/srv1/node2/default.nix @@ -11,7 +11,7 @@ inputs: { static = { - br0 = { ip = "192.168.1.12"; mask = 24; gateway = "192.168.1.1"; dns = "192.168.1.1"; }; + br0 = { ip = "192.168.1.12"; mask = 24; gateway = "192.168.1.1"; }; eno2 = { ip = "192.168.178.3"; mask = 24; }; }; trust = [ "eno2" ]; @@ -22,7 +22,6 @@ inputs: }; services = { - xray.client = {}; beesd."/".threads = 4; kvm.nodatacow = true; }; diff --git a/devices/srv2/default.nix b/devices/srv2/default.nix index bdf7de9e..39d18f22 100644 --- a/devices/srv2/default.nix +++ b/devices/srv2/default.nix @@ -85,6 +85,7 @@ inputs: }; timeLimit = "48:00:00"; }; + xray.client = {}; }; packages = { vasp = {}; desktop = {}; lumerical = {}; }; user.users = diff --git a/devices/srv2/node0/default.nix b/devices/srv2/node0/default.nix index 6dd0d27c..72a3c3ba 100644 --- a/devices/srv2/node0/default.nix +++ b/devices/srv2/node0/default.nix @@ -24,7 +24,6 @@ inputs: }; services = { - xray.client.dnsmasq.extraInterfaces = [ "enp58s0" ]; beesd."/".hashTableSizeMB = 10 * 128; hpcstat = {}; sshd = { groupBanner = true; motd = true; }; diff --git a/devices/srv2/node1/default.nix b/devices/srv2/node1/default.nix index a5b404ea..d2958bfd 100644 --- a/devices/srv2/node1/default.nix +++ b/devices/srv2/node1/default.nix @@ -8,10 +8,7 @@ inputs: { nixpkgs.march = "skylake"; network.settings = - { - static.eno2 = { ip = "192.168.178.2"; mask = 24; gateway = "192.168.178.1"; dns = "192.168.178.1"; }; - trust = [ "eno2" ]; - }; + { static.eno2 = { ip = "192.168.178.2"; mask = 24; gateway = "192.168.178.1"; }; trust = [ "eno2" ]; }; fileSystems.swap = [ "/nix/swap/swap" ]; }; services = diff --git a/devices/srv2/node1/secrets.yaml b/devices/srv2/node1/secrets.yaml index ae87da21..7a8c67b2 100644 --- a/devices/srv2/node1/secrets.yaml +++ b/devices/srv2/node1/secrets.yaml @@ -1,4 +1,6 @@ tinc: ENC[AES256_GCM,data:0fOvjy/b+87HS+bcNENY3jfxcxMLcjeQh/hT5HIUG2aCiTLbsmlqXTR9j18ZwcKAAEbzzDSonpPmQv/kGeMyvk9B4Q0En8FSdBaW5y5HQVLf32KlSoq8+MBRPTQREcHHMDZ/tQw02aAdq0jvYpHnFIKiqOZFfGhKo2oS12wxlR33n+zwqwyBu5quN0ynbwG+BMZua9uJrlsfFe8ttu5BHzl5xdCTVzmJ7vV7H1K7lJBwlDF62Rn6zsQV2uGaUew1ScephX/KC40=,iv:eA6YLGY+d4BldBAsqFsrrUiTY3Xa7eJ687C3gS7ofG0=,tag:40QXjFYc0ht7/OuIPDo1Wg==,type:str] +xray-client: + uuid: ENC[AES256_GCM,data:i87JKtJD5CEcGioPILKgJKyDpBX/o56XFBwD8WCBfpoevt6F,iv:KMtg7KqO5q+SYossPyE7tF74vZ3yg8v3u+Q8F63hvxw=,tag:10VBfnyAfB5NkdL9GAX66g==,type:str] sops: age: - recipient: age19ax6vm3pv8rph5tq3mmehd9sy9jk823tw8svsd790r0lkslycquqvlwz9m @@ -19,7 +21,7 @@ sops: ZU40ZzNDU29HeGtMMVhELzBGMXZZVFkK16e15tjwN12BYnGutnGBWIs2KBCkOJww wdgC+3aRnGjfb0Z8Htf8qUCW5omixcbaCmMoGmGsnkx1Agfr56qQ3w== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-10-12T08:53:30Z" - mac: ENC[AES256_GCM,data:+WZvi4HIk3P1ZKL5Bml4OgAsB4XdPVtlioVQYgaEGoTy/g3lqkCKRQok2ceQ85Mpj4NTf9PEK1Xlx8k07Mqrk51zINPNGOe2LCl233Wdbk9wCOOU3pdrj+Vj+zrd07P3KR/PVR79Mr/jrFgHRYKfdbGLOANyfDG3bUedTLLWcNw=,iv:oxpDJeSlGWl+331VJUyL+IaTezu1GPHJwo/8JKJ0+XA=,tag:fvT24Dtt1ECDCm5wJKWCwA==,type:str] + lastmodified: "2025-11-16T03:16:19Z" + mac: ENC[AES256_GCM,data:SvvHb6EPAkt96DprqDSTKIFwshSm2rxGtFmpB+q4l9ZUu1uCCVJM1Gnxaogxiwf1CAk3+I0908/vRp9rwALcyZdM47VJq4MST2FFmEYXn1109jrQCW1EgkXnMBJwP8ywe2JLlyRpPXcGJfC/HPuKMpyxts9EEk6TnEsdrEQFbwE=,iv:mb7ZqFuaq8xee2k9nw7zdW05puOuIdsTq7alkn5V6Ts=,tag:6ZsbryE20u4OEtUMVD5dDA==,type:str] unencrypted_suffix: _unencrypted version: 3.10.2 diff --git a/devices/srv2/node2/default.nix b/devices/srv2/node2/default.nix index efd54691..8a706e7d 100644 --- a/devices/srv2/node2/default.nix +++ b/devices/srv2/node2/default.nix @@ -8,10 +8,7 @@ inputs: { nixpkgs.march = "icelake-server"; network.settings = - { - static.eno8303 = { ip = "192.168.178.3"; mask = 24; gateway = "192.168.178.1"; dns = "192.168.178.1"; }; - trust = [ "eno8303" ]; - }; + { static.eno8303 = { ip = "192.168.178.3"; mask = 24; gateway = "192.168.178.1"; }; trust = [ "eno8303" ]; }; fileSystems = { swap = [ "/nix/swap/swap" ]; diff --git a/devices/srv2/node2/secrets.yaml b/devices/srv2/node2/secrets.yaml index 5fff63b4..7e83c3ce 100644 --- a/devices/srv2/node2/secrets.yaml +++ b/devices/srv2/node2/secrets.yaml @@ -1,4 +1,6 @@ tinc: ENC[AES256_GCM,data:zz2sNzrCiqUvyccyhG7hzpF3E8RMdWWdIW98j4Kw8rSGZEKtSkCX/YDibTRSOIuSn/hX7P9FqKgoOgKhqQcuh2gsRjaZSbccMhc3NqOXujL5y586PD9xCk2bUXDXzmRiHx8oiB1rOO86KQovfevl0yGtfpDmkuqt14OXNXvrVoCA4ChfUVwy0Yw53JlQrXl9ZndRvP6pHN4esv9UmUxrA8b//hFyJHPzSKiIfX6NGx+htH0P5UUSxKomYNqCrrtJG9RoXSgo2Go=,iv:jy4qmcl5QDaA6ub7/vHQpgiWIFj4tw0IKxGeg40W/E0=,tag:g6+jb5fInKukYWvIekyDxw==,type:str] +xray-client: + uuid: ENC[AES256_GCM,data:jPo7ixnm8KnAfdC3b02qGrts7/0nc0Ahizj0EkFa15b5zr0F,iv:S41TMqOH5mqhF36B/ouMfCjim364LeeGbDnwQYiP4Po=,tag:aoC9JOZjtbduEMFijvDprA==,type:str] sops: age: - recipient: age19ax6vm3pv8rph5tq3mmehd9sy9jk823tw8svsd790r0lkslycquqvlwz9m @@ -19,7 +21,7 @@ sops: bkk0ZWpobXh5dnFteTVVamxGT1RUblkKLU7cgLazHAzsstKjMW2GvwXkfNOtPzx8 QKIIM0rOXYUsDUQozrxRu2SChCJ/zkAxeLm6rvD1JYVMcUfuswCRlQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-10-27T06:34:19Z" - mac: ENC[AES256_GCM,data:0US1WVfJ9dvXTL36XpM+veFfdUl56CxgYBSdXJe0+LPHZhpcM/R9O2DsD4kzGmvqB8d8gm140zr02F6H+tqP6IHYbNSU20uISheF4dfWFFu6DlHqx3+c9aRxrmX8PUlwHmyDsjK0Uu6wdsEeWiPqkXkA9lpDNkATlHgsbspH3Zw=,iv:21mFu3TB4+SxwBQgPGhbLQI/6SPL97j3hATo66XWUtQ=,tag:2sn70EntUBrJ5w7zy/7dpw==,type:str] + lastmodified: "2025-11-16T03:16:36Z" + mac: ENC[AES256_GCM,data:0T9DXFvsCdDibpxBVX/GIkziEf9vR6Aic1+vIZFVPUkWCBa4/X7u7NF6Aeul/oIGy8WEH6EwyvijkFiHi4gzCoqetdHGDLeYXkBxarpSgUlcvcVbgd3EHsLJ2nclK7VAgrAu9NJpuXbiLGDl3IJyuW9qK2tzc1/ZfJHglpgyEh8=,iv:90D1aDIy8pI2MzeaZ+OwmKB4r7O2O1sibg4z7gAz6rE=,tag:mjaIC40oW5JWdlUvq0Ea7w==,type:str] unencrypted_suffix: _unencrypted version: 3.10.2 diff --git a/devices/vps4/secrets.yaml b/devices/vps4/secrets.yaml index c58c1ac0..53602d71 100644 --- a/devices/vps4/secrets.yaml +++ b/devices/vps4/secrets.yaml @@ -38,6 +38,12 @@ xray-server: user21: ENC[AES256_GCM,data:0X5x3SATZm25kVf8cu7TGm2t95DneLAqhP16fRQCtROzyZyg,iv:dmlwRmubnRq2fNdNz3lVlAVYpPjVHkFm60IvPcajjds=,tag:eDJYYf3eRw+FxfaHiRDk5Q==,type:str] #ENC[AES256_GCM,data:O3ovvRYzFrQY,iv:/Zs8e6u7wdp18AacZ3WWBvn5PDtXDnQ6ZyqLiyYmvAY=,tag:HmhKBI3aRCIR34vOEnv1iA==,type:comment] user22: ENC[AES256_GCM,data:ee0naewdOjIxA0QEpmUyOSu++sUJQneEufhJBHiyOR7jAPTU,iv:09fZ0dLUZHp9wM2lCiIcTzFey2AkWBmnUCfq8W3FM6Y=,tag:dHBVo/Ok3Q9vy1pIbWC1Kw==,type:str] + #ENC[AES256_GCM,data:4c32beMPpQ+4szg=,iv:4km+v++i4eYas+P8i3WwV9bV6TxbPSzmucCmeSu0p2g=,tag:quf046UvbNtTDos37n8a/A==,type:comment] + user23: ENC[AES256_GCM,data:MUYN3iDppGdjjLpyzEoHZiwkO00fywJeZ5f3w3unhp+eHc/R,iv:dfBK/2pTjM0jocRzqxwjBVcgc6V6fvzXFEfr3KyHZAs=,tag:blZaq9sjqjAtWhaNWUF7jw==,type:str] + #ENC[AES256_GCM,data:vpFGV2+L+YyLNTg=,iv:bJf0+L0BkQp7oUDeQ7KdYnRmKlVx76jq0jf4WP9OKYw=,tag:ueyUH888YjhYG20fQRTDKA==,type:comment] + user24: ENC[AES256_GCM,data:RThahfgiEFsWEwxbQ3CDEmWoAtsCYqoEyL4ZieUGZcHDJJI9,iv:WI9PQN8x0ZWe/ynNSrsxTYZBHeIGMqCWKJXl9rgXJlI=,tag:PID6SxebECYfrNPufpQg/g==,type:str] + #ENC[AES256_GCM,data:BCdrNNEtaQpcha4=,iv:VAoROG1g+f7D3lxzTRO37OfMeLq5UatInsq6waAwAMQ=,tag:g5NHQRbOeXhrTWHrDS4wPg==,type:comment] + user25: ENC[AES256_GCM,data:r/fwdzUeXpPrnt2H1Dnx5YI19UWXiJBVH0jjDSRGUSuUcXGW,iv:YGI2C9R3Z3mGlPDKgoT73ec6y1X/fg8igwIhX0+Kypo=,tag:aqICJK048+ztNKNvp6tzbA==,type:str] private-key: ENC[AES256_GCM,data:akNIeVp2bfKvnzlS6KLAdqAo7qsGfPatzCZpN1tNRLhRVXmJCcUDVSmVoA==,iv:2Rny8ioDJ2x+NR+n7/Aluv7JZ+Om3MuJKsXiwONYntg=,tag:a3xubIr7hpVjRiHjFL/q5Q==,type:str] tinc: ENC[AES256_GCM,data:MO+GKj5Ma1weblDjViBXUR5JS8fKoc5XQp6jVimhgip1MiulkUTgJ0Z+ecazAdBh9WnaI65SnLMXLMzk5wiJfblE5KJ+UlSvn7TXKvFPoWw9WXsU96to7D+IZNAYRXj6eMJ6g9j/u01Q348s5F9RE30C9jtk2mwM1n8yyAP/BuwcyyVZK6jOwtE5zsZyinGzLTCyD8pZqhVQ63qdrNMAdvNowl38cVm5pKYsiZiU9r8fzQJXS+5R65rJPxNKJ9CYBI3ca8OGJbY=,iv:bJgHF4CFagARNXFvkNFznzyUit6LsO75RiDTxZGsmr0=,tag:zDX6N6tDoooRUmovhgKsZw==,type:str] sops: @@ -60,7 +66,7 @@ sops: Ri9hM3NRTkM4Q1lDdmdPemEweEFBUmcKNLL5qH+JeFWX0GovkPFVVAnz+4tmfG6/ 1jN8YqbMIxf5/L8tauXPf0iIiHa6pUcjtDZPr/OEmeXebmF6Bh9u9Q== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-10-12T08:53:17Z" - mac: ENC[AES256_GCM,data:uJPxF01MX0WXrkSrjBY+GHM58gSZqKjs3777LNfou2VMfwWtmiEcOTrx+i9iWAWA1idnCoDfLy4EEIGo1EhLJBFcmMvSpoFBfJUvpTCefOLkTYW6J7AHI/Bd+aYK5UXYZxk4uoCURFt1inSCiDWAw2aQ+1g+j5a/HgRtTux9FEo=,iv:a/SuzpuHkq+D2tddrMaWjn1pLJJjpb2zzEbDkcVjH7o=,tag:+lq8vfZxBRmyG9U8KXTsHA==,type:str] + lastmodified: "2025-11-16T03:14:33Z" + mac: ENC[AES256_GCM,data:GH1N+g7wL3NaSphJruLY/uvAUd93TnV0rCRoOCEXRepu0Q9H5JSEYP2vK61dtUfVhzWcoMVl7DUyZcwUkYzcyWUDdgM72O7De6L5Oa85s1XPIi8r/aB3lITm07vi9MlYo2ZnlaAtNobogyBcdFoGee2tzmtTv0PfoOSik5RAigo=,iv:m4GQeultQtVsFbEk/MQ/f3Xjc7f1M/dFHesqNrdbLP4=,tag:GKtnw6wivZT67YJFv/vPyA==,type:str] unencrypted_suffix: _unencrypted version: 3.10.2 diff --git a/devices/vps6/secrets.yaml b/devices/vps6/secrets.yaml index 1cb90eda..e10c6310 100644 --- a/devices/vps6/secrets.yaml +++ b/devices/vps6/secrets.yaml @@ -38,6 +38,12 @@ xray-server: user21: ENC[AES256_GCM,data:hgDJ11crZaWcKrc+ZDQklXwpnvt/sMbARkx3sLZfQGZqQZeA,iv:2Re+hdJuT5yg/qTymfpN+KdU3criOmwuqqg+SHb8iAo=,tag:s16N6u5cRDaoWxnrCkamuw==,type:str] #ENC[AES256_GCM,data:U0CcBBJraJj9,iv:9kuHsHkSDdDT0Gi/3Oy608RArrg+4cgeii5zWbsGuPA=,tag:EvqqMNvNcWBwie28t0+52w==,type:comment] user22: ENC[AES256_GCM,data:LClSrxtBzuJUD4J4QaYXHUr8XSi+N7Zh193j/YeBZRm9sjgf,iv:djiq3+iVnuKK2HveoCm/j8FezzrHRGnjbyoO6iGm6eA=,tag:N5hqYyvJGxnwT8wbxdnjiA==,type:str] + #ENC[AES256_GCM,data:tR16Xl+pLvFLads=,iv:MGQ18L3w6LDOi76jANFixh8kC/ziOPikXfWpCUFI9Rs=,tag:kSTCs8i4IKM/UP/LJX7nag==,type:comment] + user23: ENC[AES256_GCM,data:SfZ4Tqk/qXA1LOp60ZEU9SRS8Hx853KosuiSVeeUm57Ed+G6,iv:Yy2hdzJWaz0jTQLujK76yP075QFz8Y3CWQc3qFrEVeM=,tag:f4d1iyIJieuHkuZ6WSku0g==,type:str] + #ENC[AES256_GCM,data:yLiQ6P2Ae2wNViU=,iv:OcAcPhRLVF1BiwTXpgpPVRqPKdNxL4MbJVqLojj/vcY=,tag:en8OEDi/zqWFigUJUQ4hvg==,type:comment] + user24: ENC[AES256_GCM,data:qVm+j7ZW1FsfKOG8U10fVsrEi0/zQZHRw0XkVcrH1lgSzmy9,iv:o41hUFerURluUpKLxkmwgzosgchgR9M7SFODonp/Eh8=,tag:MMd3GXPdWBTBzgBr8k4YWg==,type:str] + #ENC[AES256_GCM,data:vKYxMNgxTp7DHZk=,iv:XDdzGhnWcFEW2JMCz07RjBxIjvSfujF0ySHHhg4xCds=,tag:dA6EemJ2EyLFT+CMOGEJZA==,type:comment] + user25: ENC[AES256_GCM,data:Oq3yIOZbbpUFuF0EIe5HsCMNjgJZLjOshYamtTsycgNfKhv8,iv:2M2ZTaT6NqZhew+iYhpwPdKmeDMLMGfZXmOQkXC6phY=,tag:X39QrmmQIarzbAgVyyBREQ==,type:str] private-key: ENC[AES256_GCM,data:ts/LRGFAsYqvGvkvlxUI42IW1a8cGsSkpZhMDd3QVceRKvhPb1SRDaXoSw==,iv:6xX9xFIFUNlLBZ6CPBOz9JbHpvC4+QG9ZaCZcWdl12c=,tag:DYIa+QTV8vyl1l7OKKykTw==,type:str] send: redis-password: ENC[AES256_GCM,data:6zVKw9AmKwSWvHUZhzy0F2KcJW96uFoZY/N1Zq8ilUJOLZeX,iv:viwLIgJz9v8oadr8784OgETbEsxzGsJvVoxmOwWEFxo=,tag:XEYFnoCGwlnrkqaUbgeH+Q==,type:str] @@ -68,7 +74,7 @@ sops: ZXFTU3ZCaW1pTVh0RUJzdDdGdHlPYTgK2mlgcX2kEc8+2UDdBnhUm6IIuh8V6agW ooxH9OEPXUVI/4JcDo4v8ZUhAyU1ehLH0Ef7PJCChOZe2KZmWSNbhA== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-11-06T12:37:48Z" - mac: ENC[AES256_GCM,data:Xi7Y1jNQqbj/Dn1vtUr5k867+rHVR60rX2DwpMx1r+XsIrd+3gh6fC2sIVFbT7H5qHxJTePJLxo6EwGTKlGwiIffTfFZzwUDbcL7bxe6V3yYzDxhrAs+bxBS66EfgJN41jlHJbw9JwsrA6VOQjiXe0u8srXt9nAg8s4Rv2cp4ec=,iv:ty+UcZ/jLTXlvdqPF978cC9Vys5sBsoBe4u8cw1TP4M=,tag:JWAPhpZHjTtvuIaWZo0V9Q==,type:str] + lastmodified: "2025-11-16T03:14:21Z" + mac: ENC[AES256_GCM,data:phdSi/CCmw4YZ+W9XeVrR7J1ezbvNRVxQdEX75GsJXw0eXzuGU49wNtrMqfYGn8zKmc2ca2ZsSn679uMOUydJrCJYW/9Q/qSMG1xdoSeAtvaUzowqbI5xoYsMY3qHwxGJIBguZ3NUJDSwWgAqhLp2pv5zqxbSQtUezpP18GPc2M=,iv:dRBqSX6vwOXXHOO7femoFPoUXjoREybMtEHWHhEDIk4=,tag:U7GjDZA0+ffCrd5LRchsqw==,type:str] unencrypted_suffix: _unencrypted version: 3.10.2 diff --git a/devices/vps9/secrets.yaml b/devices/vps9/secrets.yaml index 50c7db95..4074e8d8 100644 --- a/devices/vps9/secrets.yaml +++ b/devices/vps9/secrets.yaml @@ -38,6 +38,12 @@ xray-server: user21: ENC[AES256_GCM,data:FmLYeMQNuvxP4P2a+Xhui7s0nkYM6UIWwj363nVzNxHEX+an,iv:RycABIkWQhMyKaOl8GMjQhAUyCYK90IaZ5tCyjefZBg=,tag:A1bGug0pXLH6gKROWtdvAA==,type:str] #ENC[AES256_GCM,data:ufLL4v493Q6d,iv:Ky9aIEFrMBmNBm2Tn2xTXcY2K67mGZwniEwEraeEdSI=,tag:TDcmpyDDkBi5DuJdT283gw==,type:comment] user22: ENC[AES256_GCM,data:beZ0GP3datxFsIDClx5TO6B+t4LXqypRu9qIDZD+5YaD3CH4,iv:0IzV9E9QO2bi6770t5a7fWYhaNntMZ1cp3zauIZa8zA=,tag:aCaB96Qn6IFpnuAVsrCWXQ==,type:str] + #ENC[AES256_GCM,data:oFMB5dfz94Cbh0w=,iv:eysid1cTVv3eg9qG2UeVzdWQH00gaEstD9Zz0qdp44M=,tag:pGYV9mRcaBXY+Nbnb1s5VA==,type:comment] + user23: ENC[AES256_GCM,data:6tqutOx0iKZQlSUKEgEWo6AK6YZ1zBFP3Xi4AjOJSktGYqXs,iv:ZIKLsSiP6/Qkwn/trUnsxHYnT+uwd6RMNWC0/e+bLsU=,tag:QFWDspBLiNyBn3VthUiyRA==,type:str] + #ENC[AES256_GCM,data:6kPcNrrL02PLTF0=,iv:zkfiqiW7WdqoVuv+bn/7NqiPiq98PRejo3THnd3Du90=,tag:La6HRrRqXnWLkEHYBbaaYA==,type:comment] + user24: ENC[AES256_GCM,data:eKo9nEVJNDEW5fsN4FP8yTxjDPpzubBFx6xlZ5ktlzL6+5Qa,iv:RFhVb0hRSO5FPMUfifIT7PXNudfM3L4gFrLlRT2BWZU=,tag:95a0gBLxO1jueYWKXAneTQ==,type:str] + #ENC[AES256_GCM,data:8zFZ9JpAIAeSVzY=,iv:OeXTKKz+7C3wAQPmS4K4HZKBuF3ZgE6Yf/yTpYtoG3I=,tag:uiQl9JDIfSMj1iVa1bnhuQ==,type:comment] + user25: ENC[AES256_GCM,data:3J2LyC8I835q3gapxQsWvScdia2VaiZ5XQZSffDrwkX6wfEB,iv:DX3GYHiwrk54bRxH5CqCG/i7vGKalh4FlKEVLz33X+Y=,tag:rGvlTVUaKxtlXcmK9vD8Dw==,type:str] private-key: ENC[AES256_GCM,data:mRbRYuozpLynUnu9iUOJmyd0JJlWyVwWoA6rHgD9r6lQEPQ87UaEwx79lQ==,iv:Hy3zwMlp9vGlYKRUf1/CFxF52KTK0v+PBXzb6b5/k2E=,tag:Of0nnc9W5gId6R7y6OKGDg==,type:str] tinc: ENC[AES256_GCM,data:8XXuOm+sb8Pda3Aiwhv9jdX6Alxy+UUbG1+ZnvM5nIJa8K4RXjSAWv9DEVh2SDpqee1uzhf2IMOBCYzicubb/BPA0vQ90SCC607B/pYb4dFuBiir/4ma5JdIliJmt9yP8qfFZKXYPsocArYoC+IUiwnxNCVjz+Pv+OwYSKJBeSlkwnRr2MAWY/KGeKEcoDrPcRohHvG9f+bcqFuTW40UdMOJNhKM2jKJh0aKcWYJOXGjAdy+41vCvWXH2FIanx0/Zt9qsPb2A8s=,iv:AmNHeAIN8DyzpXdpyM65bzpc4/6egGE7ggjBt04MpkY=,tag:Wl9/b/msR1M/EtnIhws1AQ==,type:str] sops: @@ -60,7 +66,7 @@ sops: VUFBcEpmTDRaWGg2eVZGS0tDdVp0K3cK25bDJaKLhjBUjkJWBNskR0XVOML+3dTl 04hKjDrs2TMBB5G9k6pBqqLZhoofxb1UOhlYNXlLE20HSuVntWjCNw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-11-10T05:03:44Z" - mac: ENC[AES256_GCM,data:52ljThqvqqNuDRZf9Me0soj84I5aVmTrlsWKP19pHGjG7wT07beqyys5s0OISdGqh9dAYsmWr8LyeEY79a+FYd3PzV8vriFwXeacnq5w8UEDBSbLYJGF9voMIdJcGUlzSFy7/iVTtM3ybEm58siQefP+Tmax2+C1XKmJUprbzuE=,iv:6QkUI5T9hCulX4DkbjhdCNil/77MSasKvDCTGJIjXYw=,tag:JTzUrNu0AllgM71pUtTcJg==,type:str] + lastmodified: "2025-11-16T03:14:42Z" + mac: ENC[AES256_GCM,data:ZNm1Aw3SP4mjBv62hWzGhzPUtbMqeWhInPeJVeaMnmRX/ZkvDlPtthZASImNGsW0t3Isp7e7r1Z5RwuuMx67f8JOgdIWU4xa6vfxvJWJybmRij3Ri9w2X3dlCt6kze7XWCf8qUizNuReV1OGdvdAKhy+Lt3MM//Tm05vIbLEM6A=,iv:DabWmiA36zP+U8JoCrZtipxH3G6B8f/o+oK1MsjccGY=,tag:LUBfMhiz/XqRUMZ8FJ+B9w==,type:str] unencrypted_suffix: _unencrypted version: 3.10.2