rust contact api

flake.lock

@@ -154,7 +154,25 @@
     },
     "naersk": {
       "inputs": {
-        "nixpkgs": "nixpkgs_13"
+        "nixpkgs": "nixpkgs_11"
+      },
+      "locked": {
+        "lastModified": 1698420672,
+        "narHash": "sha256-/TdeHMPRjjdJub7p7+w55vyABrsJlt5QkznPYy55vKA=",
+        "owner": "nix-community",
+        "repo": "naersk",
+        "rev": "aeb58d5e8faead8980a807c840232697982d47b9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "naersk",
+        "type": "github"
+      }
+    },
+    "naersk_2": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_15"
       },
       "locked": {
         "lastModified": 1679567394,
@@ -323,6 +341,36 @@
       }
     },
     "nixpkgs_11": {
+      "locked": {
+        "lastModified": 1711106783,
+        "narHash": "sha256-PDwAcHahc6hEimyrgGmFdft75gmLrJOZ0txX7lFqq+I=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "a3ed7406349a9335cb4c2a71369b697cecd9d351",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_12": {
+      "locked": {
+        "lastModified": 1711106783,
+        "narHash": "sha256-PDwAcHahc6hEimyrgGmFdft75gmLrJOZ0txX7lFqq+I=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "a3ed7406349a9335cb4c2a71369b697cecd9d351",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_13": {
       "locked": {
         "lastModified": 1686979235,
         "narHash": "sha256-gBlBtk+KrezFkfMrZw6uwTuA7YWtbFciiS14mEoTCo0=",
@@ -338,7 +386,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_12": {
+    "nixpkgs_14": {
       "locked": {
         "lastModified": 1685005470,
         "narHash": "sha256-Nw+4uivzCwyZcEB71YH58zYk4N5UgcNeqb+D52bjlhI=",
@@ -354,7 +402,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_13": {
+    "nixpkgs_15": {
       "locked": {
         "lastModified": 1684759798,
         "narHash": "sha256-Kpbf5yKvKcj/yPqE1zYC6gju4JwTsYxTIZEvOII0jr4=",
@@ -368,7 +416,7 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_14": {
+    "nixpkgs_16": {
       "locked": {
         "lastModified": 1684759798,
         "narHash": "sha256-Kpbf5yKvKcj/yPqE1zYC6gju4JwTsYxTIZEvOII0jr4=",
@@ -518,11 +566,11 @@
         "utils": "utils_6"
       },
       "locked": {
-        "lastModified": 1701043062,
-        "narHash": "sha256-rcsFtop++W71GmCyuAv44DTm7hKDgMjzarnmPBSRmQQ=",
+        "lastModified": 1707981351,
+        "narHash": "sha256-tewij7frJj3QRpxzfzxAI05cDs3U5tnS5eodEeGaikc=",
         "ref": "refs/heads/main",
-        "rev": "2241526e1513c490cd184ff85b7b4ffb3d190344",
-        "revCount": 5,
+        "rev": "f23acb65f1399e8a990a73b2d94131a31c9075ac",
+        "revCount": 8,
         "type": "git",
         "url": "http://git.tempest.dev/ashe/nixos-wrapper-pounce"
       },
@@ -537,11 +585,11 @@
         "utils": "utils_7"
       },
       "locked": {
-        "lastModified": 1706497550,
-        "narHash": "sha256-Gf3C8osHlu8p7KxwMyTqZelv0ZuAaeYVNq4cBJ0CarU=",
+        "lastModified": 1711177915,
+        "narHash": "sha256-F9sNekMrRbLzN8Q7V7oH5VBC6jQX1oLE05IJ1ZFe0uY=",
         "ref": "refs/heads/main",
-        "rev": "39f410d45e1799f354d303c7c05ebf0f9b337f69",
-        "revCount": 23,
+        "rev": "62c18034fcc19fd05f0dc5f26eaab324bc34c0b5",
+        "revCount": 25,
         "type": "git",
         "url": "ssh://git@git.tempest.dev/ashe/nixos-config-private"
       },
@@ -564,6 +612,7 @@
         "private": "private",
         "seance": "seance",
         "tempest-contact": "tempest-contact",
+        "tempest-contact-rs": "tempest-contact-rs",
         "tempest-secret": "tempest-secret",
         "tempestdev": "tempestdev",
         "tmpfiles": "tmpfiles"
@@ -634,6 +683,21 @@
         "type": "github"
       }
     },
+    "systems_12": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "systems_2": {
       "locked": {
         "lastModified": 1681028828,
@@ -774,11 +838,31 @@
         "url": "http://git.tempest.dev/ashe/contact-api"
       }
     },
+    "tempest-contact-rs": {
+      "inputs": {
+        "naersk": "naersk",
+        "nixpkgs": "nixpkgs_12",
+        "utils": "utils_10"
+      },
+      "locked": {
+        "lastModified": 1711176813,
+        "narHash": "sha256-n00SWId5uklSBnaOMk8XLWPguHH7xQPmR+fvacP/Ntg=",
+        "ref": "refs/heads/main",
+        "rev": "562c40ecc9f2a09bc8651f2748d6fd5152b79484",
+        "revCount": 7,
+        "type": "git",
+        "url": "https://git.tempest.dev/ashe/contact-api-rs"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.tempest.dev/ashe/contact-api-rs"
+      }
+    },
     "tempest-secret": {
       "inputs": {
         "nix-filter": "nix-filter_7",
-        "nixpkgs": "nixpkgs_11",
-        "utils": "utils_10"
+        "nixpkgs": "nixpkgs_13",
+        "utils": "utils_11"
       },
       "locked": {
         "lastModified": 1685398072,
@@ -797,8 +881,8 @@
     "tempestdev": {
       "inputs": {
         "nix-filter": "nix-filter_8",
-        "nixpkgs": "nixpkgs_12",
-        "utils": "utils_11"
+        "nixpkgs": "nixpkgs_14",
+        "utils": "utils_12"
       },
       "locked": {
         "lastModified": 1707788942,
@@ -816,9 +900,9 @@
     },
     "tmpfiles": {
       "inputs": {
-        "naersk": "naersk",
-        "nixpkgs": "nixpkgs_14",
-        "utils": "utils_12"
+        "naersk": "naersk_2",
+        "nixpkgs": "nixpkgs_16",
+        "utils": "utils_13"
       },
       "locked": {
         "lastModified": 1684903753,
@@ -856,6 +940,24 @@
       "inputs": {
         "systems": "systems_9"
       },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "utils_11": {
+      "inputs": {
+        "systems": "systems_10"
+      },
       "locked": {
         "lastModified": 1685518550,
         "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
@@ -870,9 +972,9 @@
         "type": "github"
       }
     },
-    "utils_11": {
+    "utils_12": {
       "inputs": {
-        "systems": "systems_10"
+        "systems": "systems_11"
       },
       "locked": {
         "lastModified": 1681202837,
@@ -888,9 +990,9 @@
         "type": "github"
       }
     },
-    "utils_12": {
+    "utils_13": {
       "inputs": {
-        "systems": "systems_11"
+        "systems": "systems_12"
       },
       "locked": {
         "lastModified": 1681202837,

flake.nix

@@ -9,6 +9,7 @@
     tempestdev.url = "git+http://git.tempest.dev/ashe/tempest.dev";
     tempest-secret.url = "git+ssh://git@git.tempest.dev/ashe/tempest-skycord-secret";
     tempest-contact.url = "git+http://git.tempest.dev/ashe/contact-api";
+    tempest-contact-rs.url = "git+https://git.tempest.dev/ashe/contact-api-rs";
     gotosocial.url = "git+http://git.tempest.dev/ashe/nixos-wrapper-gotosocial";
     ashen-earth.url = "git+ssh://git@git.tempest.dev/ashe/ashen-earth";
     drowning.url = "git+http://git.tempest.dev/ashe/drowning-among-stars";
@@ -28,6 +29,7 @@
     tempestdev,
     tempest-secret,
     tempest-contact,
+    tempest-contact-rs,
     gotosocial,
     ashen-earth,
     drowning,
@@ -49,6 +51,7 @@
           tempestdev.nixosModule
           tempest-secret.nixosModule
           tempest-contact.nixosModule
+          tempest-contact-rs.nixosModule
           gotosocial.nixosModule
           drowning.nixosModule
           seance.nixosModule

hosts/nyx/include/services.nix

@@ -15,10 +15,15 @@
   ashe.services.tempest-secret.port = 4443;
 
   ashe.services.tempest-api-contact.enable = true;
-  ashe.services.tempest-api-contact.domain = "contact.tempest.dev";
+  ashe.services.tempest-api-contact.domain = "contactjs.tempest.dev";
   ashe.services.tempest-api-contact.configFile = "/etc/tempest/contact.json";
   ashe.services.tempest-api-contact.port = 4444;
 
+  ashe.services.contact_rs.enable = true;
+  ashe.services.contact_rs.domain = "contact.tempest.dev";
+  ashe.services.contact_rs.configFile = "/etc/tempest/contact.toml";
+  ashe.services.contact_rs.port = 4446;
+
   ashe.services.social.enable = true;
   ashe.services.social.appDomain = "social.tempest.dev";
   ashe.services.social.accountDomain = "tempest.dev";