From 39dbad203162fa833a74e0ef20a13b0c396e9568 Mon Sep 17 00:00:00 2001
From: chn <chn@chn.moe>
Date: Wed, 23 Aug 2023 20:22:27 +0800
Subject: [PATCH] add nas xmupc1 to all system

---
 .sops.yaml          |  4 ++++
 flake.nix           |  2 +-
 secrets/nas.yaml    | 22 ++++++++++++++++++++++
 secrets/vps6.yaml   |  6 ++++--
 secrets/xmupc1.yaml |  6 ++++--
 5 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100644 secrets/nas.yaml

diff --git a/.sops.yaml b/.sops.yaml
index c18f890c..09420e9c 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -25,6 +25,10 @@ creation_rules:
     - age:
       - *chn
       - *vps7
+  - path_regex: secrets/nas\.yaml$
+    key_groups:
+    - age:
+      - *chn
   - path_regex: secrets/xmupc1\.yaml$
     key_groups:
     - age:
diff --git a/flake.nix b/flake.nix
index 2e1e1e4e..ce276a2b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -36,7 +36,7 @@
 			packages.x86_64-linux.default = inputs.nixpkgs.legacyPackages.x86_64-linux.writeText "systems"
 				(builtins.concatStringsSep "\n" (builtins.map
 					(system: builtins.toString inputs.self.outputs.nixosConfigurations.${system}.config.system.build.toplevel)
-					[ "chn-PC" "vps6" "vps4" "vps7" "yoga" ]));
+					[ "chn-PC" "vps6" "vps4" "vps7" "nas" "xmupc1" "yoga" "pe" ]));
 			nixosConfigurations = builtins.listToAttrs (builtins.map
 				(system:
 				{
diff --git a/secrets/nas.yaml b/secrets/nas.yaml
new file mode 100644
index 00000000..09dc348c
--- /dev/null
+++ b/secrets/nas.yaml
@@ -0,0 +1,22 @@
+xray-client:
+    uuid: ENC[AES256_GCM,data:0q37D3FVH95eSmw1KPuQSbt6zgzdt9iyO6Mnsk/CiDtp36BR,iv:V0sZLD4VAPF6LQg+mrWxpvnKfkCwQlmwGuJ86XEe8Ik=,tag:UEQAcpkv1LmuIBF50PL0lQ==,type:str]
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age19ax6vm3pv8rph5tq3mmehd9sy9jk823tw8svsd790r0lkslycquqvlwz9m
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArbFR2bHMrRmdXWVVHTTlJ
+            VVFoMXNBWUU0MGkrOWl0bEphb3JlSTlsN25nCjE1NTZwTHM1b09ZeS9GQ09pRFB0
+            TFRPcW5MTGI1dTk0YXFsVmI1ZmVnTlUKLS0tIEpZNW1YMi9Gc0laRkxYbEw2TGd2
+            MVRPMDVCeHVlOTBnWVNJZ21kcmlBTFkKKbyR6MGaKRvk23toLEdD9s7deQN2Dp9U
+            fYn/X4SC7Wfm4atiDbLR3Jz6FhjRAN+s//lrojRb4yqoipa2AN5tPA==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2023-08-23T12:21:23Z"
+    mac: ENC[AES256_GCM,data:sUfKYYu4aQYa2hO09aRXDdlrxY9T8ePb4sMTf8hfHHZLRaxLubWy7JkzVdxlTDpCHEZIW5J5zpbcjpvE8ZC5G/m45iCLwJIqAM5teSoG5FW/hR2uzfSuRsF/5vh1xFREsGtMLYskBobvf9mssBwRXgaKOv4zAHzlBmEhTLTBFLg=,iv:TmjRAHISDSK1+M1WtrMYF20cdCPCqu05VhHl6/ipKB4=,tag:jwMdzZoFu1IOB3sg2/kxlg==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.7.3
diff --git a/secrets/vps6.yaml b/secrets/vps6.yaml
index 94453999..6eb7f1fd 100644
--- a/secrets/vps6.yaml
+++ b/secrets/vps6.yaml
@@ -18,7 +18,9 @@ xray-server:
         user5: ENC[AES256_GCM,data:iDuLRb4dhLUOjpamioMwoTYrn7Cy+Ln4SaedVXkwVD05rjJ0,iv:AqzBBvLpJuIJCUJq0IyDcHrlqb0e84nQC0c94Rj85uw=,tag:0xou1i/iwAxGngO74OIMXg==,type:str]
         #ENC[AES256_GCM,data:zsCT,iv:iTPnIsLoQKbmJuyFrf/aCKsiOy/TOrnbpJLu6dWFT4o=,tag:lFybPTAA7EedSsJ5dEfCLg==,type:comment]
         user6: ENC[AES256_GCM,data:WLAKPPIHGvZrTaGMLFRQIgEYWFHYy0mD6sLJEYjCD+g93wek,iv:fCOxekJSBczJz/ODYwWgk1CqERc5q/87C+G/9ETuaSI=,tag:rkpBLQoEOPnWuE+U+BnzIQ==,type:str]
+        #ENC[AES256_GCM,data:D5xiJW0Oyg==,iv:9a/6myiT9Crf/fff6ZkXj/obW2k95cABUNqQdPmcwcc=,tag:chs8BA8YtVkM9m3Ey9ETlA==,type:comment]
         user7: ENC[AES256_GCM,data:7rxvmKbtYrDKBlo8kZIfd86KLd9EcSWB0ikasIRqfCZ24W0h,iv:Uplz4fnFymmBVZ9YTniHFFY3EVSrTYsg1+CTFqBu1WY=,tag:l3EPeYRHSeRsCyRhqFRrEg==,type:str]
+        #ENC[AES256_GCM,data:8FxApg==,iv:vPa5p3QVHAvw+ECusWGqx1ugTcHh42CVFDQcMhG59wM=,tag:lHiZtydcYFBQiXnWh8pCrw==,type:comment]
         user8: ENC[AES256_GCM,data:FNT3hHMwPJu3iI1LuOP1KvsoOonh+J/ecrNrRQO5TpunDPUq,iv:tTEB0MSUmQ39tNq9v1BTfaEcJY7Y59CPHRASMC1a4U8=,tag:klDm6Isk52hG8ubcFu6yHA==,type:str]
         user9: ENC[AES256_GCM,data:4BD/4MXAVLhDm3EXdgTiEgPketf0WgflVPGb3/JMWXfycEKY,iv:jwE5sFVxZjORwoqCBdufP2EhetVtFGHyCP58AzJwle0=,tag:OCteA20hDBLI9zt1ET0tUQ==,type:str]
         user10: ENC[AES256_GCM,data:d9qxJQH9Jo8gJKUi5jjSdVwqzuHG+dj08Tk+TxhczJmlSaFT,iv:DS+9isZX2B9AYAyV4Yle4fpHzA/SHcR56B/GW8QdALw=,tag:9nUQ0OuMCuXGSZs2kjfnIQ==,type:str]
@@ -73,8 +75,8 @@ sops:
             ZXFTU3ZCaW1pTVh0RUJzdDdGdHlPYTgK2mlgcX2kEc8+2UDdBnhUm6IIuh8V6agW
             ooxH9OEPXUVI/4JcDo4v8ZUhAyU1ehLH0Ef7PJCChOZe2KZmWSNbhA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-08-22T06:50:14Z"
-    mac: ENC[AES256_GCM,data:rYVUvOlTWyMGACOc8aLtF/bPsQvAG0fOYzPoSW66WdIFG+Z6QJbko+5CKcdKhKi+Pmt7TtvD2XNgqGjwsXy6xwqhFSrwCSS9CFuWZ2LZwac5B8zUXAz8R/5sL+xwftbLonKxg30MXuiQOFogobta6NOZrXQfYgC84vemtZRvDCo=,iv:txmKA2UQW2K2D1sglDY2CTWLiFTJA7DxfKD4pW6zC54=,tag:GVARcmlHa0EjBt+LuxGYPQ==,type:str]
+    lastmodified: "2023-08-23T12:20:06Z"
+    mac: ENC[AES256_GCM,data:CWVcA+ssnLBvYnX+spddvKe8hbaugaLSVXqUNDYEVaVfLCJkXaHzTOM3Kgp6DNlXCTV40lYqtW4XMvK6CbbJpuxxsy5AlgA0lsVgPGT4JZFmrXFcsN3WUVA6L5trjVaJ044NwSWBDYUsHrkgnck6nWWyIUxzMUerCinCtuMaXHI=,iv:U2ZTD1g0d6COnShHvBOHugqYPpeO8Sba/FVPH1sgHsU=,tag:EfZcb69v+qVG6P+rcXVIyA==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.7.3
diff --git a/secrets/xmupc1.yaml b/secrets/xmupc1.yaml
index 597deffb..ca003eba 100644
--- a/secrets/xmupc1.yaml
+++ b/secrets/xmupc1.yaml
@@ -4,6 +4,8 @@ nginx:
     maxmind-license: ENC[AES256_GCM,data:VmOiT6FYFEkMYTstz+4+4MSZSeOgHQh437j6Ccd/EhYVEa8iKI1PfA==,iv:C90KL+tv3ZpbnHqsKv0hLUprM1RKagCdU2ne3Z9Hor4=,tag:QVlJZL+bnVpjEzy4VF31vA==,type:str]
 frp:
     token: ENC[AES256_GCM,data:lo/To0asGgHnajc6GD6zh+e9onIwQ6XdfTA5wg7g+fvslzxH6eXhV+14Wkb86E2fn7AAlru+,iv:d2MHOCwc5E8nAcqjWxdzONPpjdFfJ01f01Q7a7C2CT4=,tag:5zzciq12PqWT29G+BaT1XQ==,type:str]
+xray-client:
+    uuid: ENC[AES256_GCM,data:+UJjAWH31CbeQjWoFNeBW5Sqt/RoBTbgouelDYGKfK5G6uY+,iv:AzIpLV7NYeqZUmZ6PZNYFbml9TUPRLTFPeiRQm8S7X0=,tag:/lDbaFCUHmVYDHtmrMisGA==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -19,8 +21,8 @@ sops:
             UDRVZ3luNkRQNFdtYUF4bm4vd05mdkEKlX67g6DrurDVrSG2+5lj4wZ+8xfEpu9K
             jAZ8pt1pCsrbkGOWOBD5PqbWn0X1Dms6F4qiyefcQlmIjhXc9/PPLQ==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-08-16T10:07:44Z"
-    mac: ENC[AES256_GCM,data:/RA6qVw0X3kI6NBMkstKSoNIJWt1daOMnxd4HwSvh5KeOt0ibem8ejh4McWNzHEIRi0tDu7VLHo8S/TNZ2DKWOUL2C7xDLfzEgw4K+noUzmykufHLpQX9x5B7+CbSbzRCxCjOj7+bkbem8JgtxGDF5DhtszA9gv23s2bGDVjda0=,iv:WfiBPwumrVn3mQqw8NPHMmVNdjnD5G8Ke/yuNhkq1JY=,tag:DBeN0DFGt2xTs2X6odBUeQ==,type:str]
+    lastmodified: "2023-08-23T12:19:57Z"
+    mac: ENC[AES256_GCM,data:beF84oGJhqGwl7E7jan9oZMlJmPZrQdC0ZAif/zpCYwdy53v9J4R5RM7pKZ0CFQA+ubwW4GZXrv2qTLayV2FgRtu+TBWLeRF5t34AcfyMHmChiIuAjHljVv3Y0Cus3Ctt2quMpyvmYEGvq+bGPzi5BY+cu4PSQZUsUUDImjw7/g=,iv:pUEJKfzZ5loUJvzpCRHNpUK4aM2OiCQ8RLFZRr2iiVU=,tag:ibGL5Wb1PJhMck5RnPtobA==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.7.3