+

oluceps · Feb 10, 2025 · 5e0412c · 5e0412c
1 parent 37063a7
commit 5e0412c
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 25 deletions.
diff --git a/age/trust.nix b/age/trust.nix
@@ -31,22 +31,31 @@
   "db.pem"
   "dae"
 ])
-// (
-  let
-    genHyst = name: addr: {
-      "hyst-${name}-cli" = {
-        file = ../sec/hyst-cli.age;
-        insert = {
-          "f3c4e59bfb78c6a26564724aaadda3ac3250d73ee903b17e3803785335bd082c" = {
-            content = addr;
-            order = 0;
-          };
-        };
+// {
+  hyst-osa-cli = {
+    file = ../sec/hyst-cli.age;
+    insert = {
+      "f3c4e59bfb78c6a26564724aaadda3ac3250d73ee903b17e3803785335bd082c" = {
+        content = "172.234.92.148";
+        order = 0;
+      };
+      "b1ca20eb6f34aa70cc00682636eb3582d592727923789fed0eeb56fa567d5c01" = {
+        content = "insecure: true, pinSHA256: 6D:C7:B5:6E:12:1E:9B:79:D1:79:C4:EA:72:E0:BB:5A:5B:AF:48:4F:75:7E:A1:DC:D3:CD:0F:8C:73:35:7A:0A";
+        order = 1;
+      };
+    };
+  };
+  hyst-hk-cli = {
+    file = ../sec/hyst-cli.age;
+    insert = {
+      "f3c4e59bfb78c6a26564724aaadda3ac3250d73ee903b17e3803785335bd082c" = {
+        content = "172.234.92.148";
+        order = 0;
+      };
+      "b1ca20eb6f34aa70cc00682636eb3582d592727923789fed0eeb56fa567d5c01" = {
+        content = "";
+        order = 1;
       };
     };
-  in
-  lib.concatMapAttrs genHyst {
-    osa = "172.234.92.148";
-    hk = "8.210.47.13";
-  }
-)
+  };
+}
diff --git a/hosts/hosts.nix b/hosts/hosts.nix
@@ -7,6 +7,9 @@ let
     "photo.nyaw.xyz"
     "s3.nyaw.xyz"
   ];
+  srvOnHastur = [
+    "cache.nyaw.xyz"
+  ];
 
   nodes = (builtins.fromTOML (builtins.readFile ../hosts/sum.toml)).node;
 
@@ -20,6 +23,7 @@ let
     ) { } nodes)
     // {
       "fdcc::3" = srvOnEihort;
+      "fdcc::1" = srvOnHastur;
     };
 in
 {

diff --git a/sec/.cache/azasos/39f03fbe573822ee4c8402c8bd3c43e570a5e57e289e770eeb5c046da671b18c b/sec/.cache/azasos/39f03fbe573822ee4c8402c8bd3c43e570a5e57e289e770eeb5c046da671b18c
diff --git a/sec/.cache/azasos/dd2ac9d8fe883ded2fdb84748d91dc3e0f5e2caa2e05c98d82b2f66813b54813 b/sec/.cache/azasos/dd2ac9d8fe883ded2fdb84748d91dc3e0f5e2caa2e05c98d82b2f66813b54813
diff --git a/sec/.cache/eihort/775d29335d828e2ce41cc2efc7d02948d1dab98e15c166d2129aa95b7298fb88 b/sec/.cache/eihort/775d29335d828e2ce41cc2efc7d02948d1dab98e15c166d2129aa95b7298fb88
diff --git a/sec/.cache/eihort/c2353327cd628999008f4840045123ff4760e62c45c67038a40f5ae8981e7097 b/sec/.cache/eihort/c2353327cd628999008f4840045123ff4760e62c45c67038a40f5ae8981e7097
@@ -0,0 +1,8 @@
+age-encryption.org/v1
+-> ssh-ed25519 D74O/A 9Zjhz44S5Nn6v66CLHZKaIEfJ8FtPtylewc76l21Lw8
+LhsxDW8b/sUPUkAxQ5nQlhFBrqIj1/BNaJIEii7gMEg
+-> z-grease kv*xuu
+klspxvKy7p3T/t0JmW5IiZ8
+--- UII5JctZgPbrU/En/+2kVm5G2coCtfkFcjOLM4yLGWk
+����`h*7u�J�U~�稌�
+�Zc�'0Gs�}�vq��a�����vH��n�}\iM��H�+����+����b���G���S19[b��hAy㹋��t,w/���m8���C�T���3!vxR�X����5[�d!@|�����ҐDK���n��eB�\H�H :m�XO��g���c m��t D~��ߒ�Gq8@�V]�6���)��ï$p�{�P,��9�&�L�'#��>z6�a��U?w����f�r6��-�|���у�v���_��+�;��h}�f7�=Xێ�

diff --git a/sec/.cache/hastur/1c8f5c02b85675e7505aa4f3c46ad00b576808d24538255edbfd0e026677a3b7 b/sec/.cache/hastur/1c8f5c02b85675e7505aa4f3c46ad00b576808d24538255edbfd0e026677a3b7
@@ -0,0 +1,8 @@
+age-encryption.org/v1
+-> ssh-ed25519 LTFsWA MS4yJNGx75rnGg3qibm9ZvIsSmp6XJNxAtzMLEsb4xA
+v2ZQVEYC1blGzGCNCwIqjRL1LUQVmofmRy8NRgO8xS8
+-> $>\Ei!-grease
+yd3A5+cEqOh0A+fkRR9c
+--- LlxDu8Jl98dmLl6NMB15asCVgaK37YtU5s93PVdNlbM
+����	�b�F�9�k�
+�D"w��/C1R�V�ғ�������܎���U��֦߱:�����vK��K��]"8�����t0�%���p���|(k��FQ^��p��(�p��Oj��vJׄ���I����&�e/���p!��k^n���<�E8�y���>���-���&[y�RLh\��a\�����tȗ�AF@���$Hr	�Of�_ӡ�<��9kyH�i~f�a=Id�L�ߴݚ���.�ͯ���0��+=TB�hM���Û[�O�a4ـQ�Gr��#�gi3�a6���z�g��ˑ�P

diff --git a/sec/.cache/hastur/385298661f2106ea288530003d696c193d2f21875ddd642f4daafca285759957 b/sec/.cache/hastur/385298661f2106ea288530003d696c193d2f21875ddd642f4daafca285759957
diff --git a/sec/.cache/kaambl/0897f21f5de475901c6c3b0021dd35402a2aa9203c098dd2d3ffdc27ae3676f5 b/sec/.cache/kaambl/0897f21f5de475901c6c3b0021dd35402a2aa9203c098dd2d3ffdc27ae3676f5
diff --git a/sec/.cache/kaambl/2a8879cd666dd90af00c3dacc560052feafdcdd33be08391d7c0fc6a9576dda0 b/sec/.cache/kaambl/2a8879cd666dd90af00c3dacc560052feafdcdd33be08391d7c0fc6a9576dda0
diff --git a/sec/hyst-cli.age b/sec/hyst-cli.age