devices.xmupc1: re-encrypt

2026-01-12 04:39:23 +08:00 · 2024-02-26 14:05:00 +08:00
parent a92eae2b67
commit 309812741a
3 changed files with 32 additions and 23 deletions
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -5,7 +5,7 @@ keys: # cat /etc/ssh/ssh_host_ed25519_key.pub | ssh-to-age
  - &vps7 age137x7csalutwvfygvvzpemlsywvdxj3j4z93a50z2sjx03w6zau8q3r5902
  - &surface age1ck5vzs0xqx0jplmuksrkh45xwmkm2t05m2wyq5k2w2mnkmn79fxs6tvl3l
  - &nas age19lhcwk37jmvn6z0v4dpdfh0k4u23f76twdjknc0p7atktf37rd7s4t4wj3
-  - &xmupc1 age19ax6vm3pv8rph5tq3mmehd9sy9jk823tw8svsd790r0lkslycquqvlwz9m
+  - &xmupc1 age1hnarptkze0ujpp05dqr8uma04cxg9zqcx68qgpks5uf5l6rpk5gqhh8wxg
 creation_rules:
  - path_regex: secrets/pc/.*$
    key_groups:
--- a/secrets/xmupc1/default.yaml
+++ b/secrets/xmupc1/default.yaml
@@ -1,18 +1,18 @@
 acme:
-    cloudflare.ini: ENC[AES256_GCM,data:k7ojGrQQN81OGh391ISD0vfmQF7P3Iiuyx4ck7FxB9h3hFyl6HsiJxp3tIKsFBirbHzePEtXZOYmYUkqqw2i8dY=,iv:RX1BpzeznkrXhLVoI1YwrlRDnkQqGYNw/xwQvN8P9JM=,tag:TOfGt4QwxAY2j/c1deKFoA==,type:str]
+    cloudflare.ini: ENC[AES256_GCM,data:PjCyozvFTXxA///enYYbaMZ8ISfFjJviLVKfdOcMSi5G3CEjEsp1Ez4krbgy4/eJo4v9HfTN0bMmUnl2OHOyzTg=,iv:e1iQZ5JUHkzfnfP956Lzl3FWs11xdULctA5MZsALtU0=,tag:8X2Q/Hixxn/ci4XRSUDidg==,type:str]
 nginx:
-    maxmind-license: ENC[AES256_GCM,data:VmOiT6FYFEkMYTstz+4+4MSZSeOgHQh437j6Ccd/EhYVEa8iKI1PfA==,iv:C90KL+tv3ZpbnHqsKv0hLUprM1RKagCdU2ne3Z9Hor4=,tag:QVlJZL+bnVpjEzy4VF31vA==,type:str]
+    maxmind-license: ENC[AES256_GCM,data:/7R7w+fiMw54Cmd7y/wT/s8RMqFMf3Fc0Mph0ZhURmCzowkmLEhtmw==,iv:i+Z+2NbssI864Edwf73SQfaeFuWoqr+U8eQ/8R23FOk=,tag:8ITlkS97vlsmHM1HDk6/3A==,type:str]
 xray-client:
-    uuid: ENC[AES256_GCM,data:+UJjAWH31CbeQjWoFNeBW5Sqt/RoBTbgouelDYGKfK5G6uY+,iv:AzIpLV7NYeqZUmZ6PZNYFbml9TUPRLTFPeiRQm8S7X0=,tag:/lDbaFCUHmVYDHtmrMisGA==,type:str]
+    uuid: ENC[AES256_GCM,data:4PM/d263HgBseIgRplgo5ahJ8u8HuPznXt2hW5O+VawS6WjP,iv:98Ymj4eiCGQPMcaHBI9zJAaRagm82mF0LY2c9bzA+/s=,tag:8imXq/hxAxS5XKy0uWIBPw==,type:str]
 wireguard:
-    privateKey: ENC[AES256_GCM,data:49BPDoNzzTJFRpIXw3wMRStwd66aG848Z5EUMPwMMZdWeFPBdDB6cHm9zQM=,iv:R6zsmALbV3YMFlIQlGpLqL5mNXeQXn6MbhAFB7T+nLI=,tag:WOrebshoF1V0u2+GnBMTXw==,type:str]
+    privateKey: ENC[AES256_GCM,data:Azaqung7llErB7/IdnOnEkwjQ39yQHKcO7VgvMDCDTExM7nS0zx+yMYX4ls=,iv:FX8oLHMBVEnKkYOg8q2A9vFmtRZDws5T87+lEl7+2G8=,tag:DdOQUbNKB6JK7Tp6McQ0Og==,type:str]
 users:
-    xll: ENC[AES256_GCM,data:hFXYsNx3VL3LQ9WK6VZyyUQEFwGlU24uLc/87ZloqKXP+z0Mn530dsE8ujs0bu4kBYf9v/Z3/ureX3w1ww9wTzb+peRum+65fw==,iv:VcbvNj+TwgQYrK53mNriZyNCnPyzNoIMXROJW2dk27U=,tag:UT7o/7npyMPXuCuWxeji4w==,type:str]
-    zem: ENC[AES256_GCM,data:g6+j8FNa25CMkGL1CK6L3B+U+u7AEG+ITuRC0SZ6n0VmRacB/A0z/7JjmWNZdtqbiFSAqYmlBHYazGa6mdGG4dGchJnlJJIdqA==,iv:3UnzM86OpJhX5i/wkFRfJywSN8zD/PG09Mcsw54cK8o=,tag:RZUZnQQID+QIo6pH7vWwSg==,type:str]
-    yjq: ENC[AES256_GCM,data:8ubORdhLjmCYI4mAQglUAxVe6dkfhidU2d2IMAN1EDziF8s2ks0r3oSkHhnl1C9dMu2o5EmWSMR/IzyFwTqpPkQajhzrdCR+6A==,iv:SmmYdZo+8/PS3XxrFNz2U1hYABd72jE0DCNCflnLTJk=,tag:IfquGpG94mPqsQQ1sLNv1Q==,type:str]
-    gb: ENC[AES256_GCM,data:8szWbJHwh/qGe0QZrHOpu9HHN2x5koavczdeDTvyT7rQA1iNHinJVgmLHU2s8dMHaUC/uvTxTDaRXFLdVbSaJyyxzgJmIQtKLg==,iv:ZqlacGz9J6oysE3qbOYu5UleUj0eG4lMYmYn1p7iBT4=,tag:j0Dag9tuuNHSR5qtlcWIfw==,type:str]
+    xll: ENC[AES256_GCM,data:tGzKVg4prhg9oXOSX0FJIAWdF79CWsFuiU8U12dSnkBIgRXPZlJkz9mLLTENm6SjftItt/ku4MDj94KnM+nPYkIorTYtEuergg==,iv:oavvRf7/21LuDksUiXLfR2/qQNz5O6JyroxX1DwC6gc=,tag:qYbW1ZQtXo+2qGrl5wuZkA==,type:str]
+    zem: ENC[AES256_GCM,data:r2BDtAfMohsnoqw51/flvkiXe/EtJtDhakEyOTPX2E7cikfPtPD9iJPd2RnNkS3QPBKg08ex5ce2e3ywzGgNX5RKrxIacpxSSA==,iv:VfhEqTvS9qVFGif+SkBdz8VR6BXEnncMYcPQW4qqNk8=,tag:t4JBEhX+6iqnrd0JoLKpmA==,type:str]
+    yjq: ENC[AES256_GCM,data:Yb9gVDrWhpmBYI8JlGee30J+PVFVGLo4btFVGToUVj3Sr2bPetY96mEJoxYQha7SPKBoZ7+ePzWYiYOi43MZ6sYndj3C6sYmYg==,iv:2H2+ZmIIDJAKds1XSMqVcUpsix3rbxLkVlBIIAK3ifg=,tag:7redx03BsscRrk+e7dqXdg==,type:str]
+    gb: ENC[AES256_GCM,data:ZoprrHc2l0nkqy4ujYQfxNENMEnfpRhCIxX7jMPoWeTrJt2sE1AloWeVFsArJKTx8krpW96X3AXpUIauMH9kc/CviPop2QMgDw==,iv:fOIVPEHDvyZ45G9uRbx2gBE0KuZy+aEWALlXusDJ1YU=,tag:G6hZLn9/99Kj+wZAeNyxkQ==,type:str]
 mariadb:
-    slurm: ENC[AES256_GCM,data:3tf2WKmoRqQ1TvJjuVeOjGAxToRm1T3oRG+XKGKeC/GCIDitWiZJyYDDlLlSuVjjVuaiS2uMpA/yUr9sTbxl7Q==,iv:PMDmzcHb3wjE6vx1JqcWp0UDdnc6SMZ2mn16uxQ/qXw=,tag:KFSjqmStqn2DfHcWEbGOTg==,type:str]
+    slurm: ENC[AES256_GCM,data:qQMD8SKNmxb3PdScXNqppF9zkX7dV5i7rvljvZuhiI5zLnu77qYCHBW6ymh0mrY14N9NjxmQZhZWX/H8TvBlcg==,iv:J5N3LjCYW3QmuEkMBpl7qvPFW1Z9ZoPLkj45jKcIW9U=,tag:Tl+ld07+lVkmzt7f/f2MqQ==,type:str]
 sops:
    kms: []
    gcp_kms: []
@@ -22,14 +22,23 @@ sops:
        - recipient: age19ax6vm3pv8rph5tq3mmehd9sy9jk823tw8svsd790r0lkslycquqvlwz9m
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBreXVOckI3MHZMdlE0ODhj
-            SHM4TitaZS8zR1lsM050OFI3U2RtbmhzWXlJCnB1V1NXc0VzdlB6Z0d1bnJiSXdr
-            SDBHMGtTb0l4cEthd2kvNjV4ajRtSkkKLS0tIDBHMVltT2JVV3d3VjA4YmhvL3g3
-            UDRVZ3luNkRQNFdtYUF4bm4vd05mdkEKlX67g6DrurDVrSG2+5lj4wZ+8xfEpu9K
-            jAZ8pt1pCsrbkGOWOBD5PqbWn0X1Dms6F4qiyefcQlmIjhXc9/PPLQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5RWIreCtMeTZ0UE9Zd2di
+            VE9tR0x6SUNyWjlPV1BqMU5Tb0RTSXNGN2hNCkxuVjFFb0xJZTBMekxqdE96RlRh
+            czF0dHQxdVhsNE5tVWg0Q2RmYktsWDgKLS0tIFY3dHRlbFpsWUsyTzA3RVR1Qyts
+            UUJHMU13cm1lOXhRYzhSWlFyTFltYWcKDUxABRGskWWpHEFL44gHYzAqaQ3AmBDt
+            LcL/4IiEs3TwOpuY+WTVx8JKZBOsxcSlNahiDuCnoTbL4gZTPnd0pA==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-02-26T05:26:55Z"
-    mac: ENC[AES256_GCM,data:Qn5dmXAE+Ap9e6H1mc6YpJRw0ajoEPy1UCFCts2A8ACkVZs5EELK6K1C1sxlWoUhEFD0wlkUZh5IvzmRcts+gaic1XiOuEK8vI7jnY8CcG6iRtqQgKXcnAKM+gse1xOrkmghlwZ/pE7FET+XdSrYpevNDv42fPCdxLGV5QG3Qoo=,iv:8QAr87u7/VcYtiCubevmkuiFDC0kd4TWdQsYfm8jK30=,tag:O4gWqgRwOJ6YIN755wY3ig==,type:str]
+        - recipient: age1hnarptkze0ujpp05dqr8uma04cxg9zqcx68qgpks5uf5l6rpk5gqhh8wxg
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBwbHd4ZHhsTk5leDlreC9E
+            TVAzRXVuS0Judk5zTGVWRVhWSUhpMFdscEg0ClVFYzZYZG9hNjJKTlRVZ1I3eXVq
+            M2Y5by85dE1QM25yQ3g3bFVSL2tsVlkKLS0tIHVYbGxrT0hOQkZ5SHBsQ3UyaVly
+            ZDNHUjE2QVlCV3p0NHdKYW5IMHVBZzQKkZtfyvfroOntg3yRjMw4jQHiQj8eaB2h
+            IeIHfW4y01mmVT2ofbtB0xYpjcl4gtUlQ8X3tn5iJ9P8gcVo0G598A==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-02-26T06:04:25Z"
+    mac: ENC[AES256_GCM,data:2d3i3rcRYrB58vJuyhP4AIB11Ns+zQq0Pli1LF4sAKb75OmJ/qlRcwJKlOCASdY95FfzOQDGjfZheg58fVSd9EbYxX+npMXGUiODa8JRTHgQye3/qjFv14v49zKFJ0dNs13XnOEA4QAry/7gDlb0+M44bNRGPSZSoFX2yJ53smw=,iv:I1YDN6+26BmaWR84kq9zXNXjQ4cRvtzrS2Q13PlUjp0=,tag:sgxcTpOr7T2oXjb5qLRrqw==,type:str]
    pgp: []
    unencrypted_suffix: _unencrypted
    version: 3.8.1
--- a/secrets/xmupc1/munge.key
+++ b/secrets/xmupc1/munge.key
@@ -1,5 +1,5 @@
 {
-	"data": "ENC[AES256_GCM,data:LR3EOpdW0iPjiRcnd5uLoBV/Men17OvgGG4g5paKz4K1iZI0SIC0tQ+U/VAiDHAMNmQKWkCpwV9cV6pz7bWxRVeBkPLcTXdfOC6teQ+TO4Ggkm+ILCSNG22esKeVHgv+i51acSOV1Bdc5sINnxii0WKiQyB1Q/59lXLX0nFmnQo=,iv:0MS4WE5W6bm4aH/xIqtr4VBJCxuy3A6SCNBsR02OXy4=,tag:SmUPJvofzdnh7ZW/ue/O6Q==,type:str]",
+	"data": "ENC[AES256_GCM,data:tuEymMXW0f7Rui5wrz/xozphTEq6ffkYIfNIoURFNHwH2Cg+aKHz2ox0gk02BJARhPMDrxCYlChkcrEI0ma/T0eBe9sWz3tA8AOwU1lHSZ06d/JWzW7IUIyTac2mnjt3/jY/qpnR4A8wtHwD0j4zkzXgUgFwq7k/fs24acEE4Jo=,iv:iDTS0xswLrwkOYmfomE5hluVONgJYia/RjINDy7T3R0=,tag:oIYNpFCuT2D+X1QEJJiHew==,type:str]",
 	"sops": {
 		"kms": null,
 		"gcp_kms": null,
@@ -8,15 +8,15 @@
 		"age": [
 			{
 				"recipient": "age19ax6vm3pv8rph5tq3mmehd9sy9jk823tw8svsd790r0lkslycquqvlwz9m",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAya3hFZjZLRGxoOEd0ajFP\nNEtMdjRYeTd6NTBmTHlIMU5mVFp1d1RsczBZCm9SKzV4SXR2UDNFSzdpR2phbFVx\nd3BKeXVCN1VHbGw2UzhxTEZYZ3BOY2MKLS0tIEozejhDNHRPTGxHM0FkYU9mMURy\nU0cxWWZ1TXowY0VrcFhraHBaSkpvZE0K6JITpiZR3rFu+7ZgnwyNJsG+iNevQokQ\nzSZwwtJBlHHjEvK6Cuwi/HyDabsk+RknXn1cUlQtkZB4fSVBY1YDqw==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3aFRRa0NsOUp5MEg3UHcx\nc3g1VFZEQS9Tci9QSnNFYnIrT3hUdVU5cWxjCnU5UXVEdTFXczJzcHVvSjF2WHdB\nYmpyQVVaUFozKzJIZThBbXUxb2k2YzAKLS0tIHE1QXVrOXo1Y3VXMzJJYitWU3Qv\neDF1cndrSi94clh1cS9NczN0UW9pOXcKtrnIj3WovMYdcg5nWnnyRhJhTGLrlwxW\nxQ6bmNrfbZedmCNdjY2lPXmudMXJ8YlWe/HGCe94x3iFlaSwCIGUsA==\n-----END AGE ENCRYPTED FILE-----\n"
 			},
 			{
-				"recipient": "age19ax6vm3pv8rph5tq3mmehd9sy9jk823tw8svsd790r0lkslycquqvlwz9m",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBieVFjdG1sQzA0ckRLT0Ey\ndCtDbWFhMExzTkVlQ25CVDhGd2xmK2FxTGtjCnhqaVFZUXRFNC9qdXMxWEhKSGhk\nclJlcWZYS09zcDk1UUhxWE95TU1vbjQKLS0tIGJ2WWUxN1EveVZBZUVyUm9kQjl4\nY1FYc0hZOXZvaHFCME1NRHJQbDVvOU0KkQft45Ob+L3UHYCrjbzraCF/du/0dXMB\nVPXKESEAGWuJXkWLJQwaSnUZU7WZCgyOvRCUZRkhrrDBMlc4lwdfyA==\n-----END AGE ENCRYPTED FILE-----\n"
+				"recipient": "age1hnarptkze0ujpp05dqr8uma04cxg9zqcx68qgpks5uf5l6rpk5gqhh8wxg",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBocFl1SHJEemRySlBnMmNn\nVW9RS1NNdlo4M3l2WGlQaHJmbDBHcjMwaVVnCnY5WExPOXZJVEdYSlJ6UTRBMGJj\ncmlYaUNVV1hnWTNkaWVuV2VuaXN2eU0KLS0tIDBTYnd2NmVYTUJKaHZWRWo3ZlUx\nTEtPZWc2RE1XNG9WTXFOTllWVUVWeUkK+9aLz1rygGAQjpG+oMNUtrDkQaDfg+2q\nnl/CtZZrFD6NXGw6Di0X5t9fQu295NTJ/0qjXnfMigG8gDtxkE+/7g==\n-----END AGE ENCRYPTED FILE-----\n"
 			}
 		],
-		"lastmodified": "2024-02-26T04:00:22Z",
-		"mac": "ENC[AES256_GCM,data:DXqO0a94Zwl1rWUjrzaczDdSXjdK1Kre9QSSTf6rjEdiCkXSVyyXGa4b0lD/r8WVl3XzDCXARtXQ0U4Qmd1B6ms4NI/fbnly+TNDoyXfBliAatWL0K027Vp0ROE8CXLRk9Y3KTAh10TSBMwP3Pt8s9ntXJe/LpiV/+qE7HFMqMM=,iv:okuT7134QhZz0AhIiGisjwGas5wtQJJd3W04cSAX8HQ=,tag:OXLFI7enhkdtWqxFx1PfIA==,type:str]",
+		"lastmodified": "2024-02-26T06:04:53Z",
+		"mac": "ENC[AES256_GCM,data:y0RkPyUwwff95BFL951TxS/x5ORzMsxFJVjopSw+8iVtswD8MT1nmsbwyth4C9OnJ/IAtnZk/CjAt72a68AZpPI+2W/JqJq20ohFoquDNhTlsoyLWdO3Vjrd+Wo3hp0+iKQ3e/uYrF1sTqQO9a3OIxu2sVLM0gEDmIe2nJpLJQo=,iv:EjXTQvVdjzfClNfQ3rPxAFVWVqr7sSOz4ap+nshPEAk=,tag:DcIlf9W7NNqQ+gf8f46MwQ==,type:str]",
 		"pgp": null,
 		"unencrypted_suffix": "_unencrypted",
 		"version": "3.8.1"