From 7be7bf0700dd2ae6e9e9b9726ec94d211f4615d7 Mon Sep 17 00:00:00 2001 From: Grisha Shipunov Date: Sat, 25 Jul 2026 13:34:43 +0000 Subject: conduwuit: yeet --- .sops.yaml | 7 ---- flake.nix | 1 - hosts/cloud/proxy/default.nix | 3 +- hosts/conduwuit/conduwuit.nix | 24 ------------- hosts/conduwuit/default.nix | 78 ------------------------------------------- hosts/conduwuit/secrets.yaml | 37 -------------------- 6 files changed, 1 insertion(+), 149 deletions(-) delete mode 100644 hosts/conduwuit/conduwuit.nix delete mode 100644 hosts/conduwuit/default.nix delete mode 100644 hosts/conduwuit/secrets.yaml diff --git a/.sops.yaml b/.sops.yaml index 876b280..cb46d58 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -7,7 +7,6 @@ keys: - &minime age1chq5k0t38882rtyljez8cwmvtcstu4tafzvveuhjrujvsqk72f9s9guc06 # microvms - &auth age1vzwz5s35w9g8ck9l5zaq5skrnl3mqzf3hsnc9w22sj4k8tu8kqfstpg2a8 - - &conduwuit age1vd78txz0chk8sum3tceamg7u6enzcclh3vnpjswyrmarvmdmp46qdx7mqt - &forgejo age1gknaqevzuq7dtqalng3547w5qflk9a0kugymea5h54eg6twu43pqpkr4zt - &immich age1afyntwvj672lcq2e4dpxmw3syplzurnnd8q8j3265843jeedpveqkp465z - &miniflux age15ja22wd9tt60vn32sk59pp6c7vtjsn8y3rypn8qfnvxthug8sp0q6f72uh @@ -55,12 +54,6 @@ creation_rules: - *admin_toaster - *admin_frituurpan - *forgejo - - path_regex: hosts/conduwuit/[^/]+\.yaml$ - key_groups: - - age: - - *admin_toaster - - *admin_frituurpan - - *conduwuit - path_regex: hosts/stream/[^/]+\.yaml$ key_groups: - age: diff --git a/flake.nix b/flake.nix index df65e2a..8a8a3a6 100644 --- a/flake.nix +++ b/flake.nix @@ -61,7 +61,6 @@ microvm-unstable-list = [ "auth" "immich" - "conduwuit" ]; microvm-builder = ( diff --git a/hosts/cloud/proxy/default.nix b/hosts/cloud/proxy/default.nix index d743fdc..016029e 100644 --- a/hosts/cloud/proxy/default.nix +++ b/hosts/cloud/proxy/default.nix @@ -26,7 +26,7 @@ in route { header /.well-known/matrix/* Access-Control-Allow-Origin * - reverse_proxy @matrix 10.89.88.16:6167 + respond @matrix "This Matrix homeserver has been retired" 410 # file server file_server { @@ -75,7 +75,6 @@ in } } reverse_proxy 10.89.88.17:4533 - ''; }; diff --git a/hosts/conduwuit/conduwuit.nix b/hosts/conduwuit/conduwuit.nix deleted file mode 100644 index 8e344e5..0000000 --- a/hosts/conduwuit/conduwuit.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ pkgs, ... }: -{ - services.matrix-conduit = { - enable = true; - package = pkgs.matrix-conduit; - settings = { - global = { - database_backend = "rocksdb"; - enable_lightning_bolt = false; - port = 6167; - server_name = "oxapentane.com"; - address = "0.0.0.0"; - trusted_servers = [ - "matrix.org" - "matrix.c3d2.de" - ]; - well_known = { - client = "https://oxapentane.com"; - server = "oxapentane.com:443"; - }; - }; - }; - }; -} diff --git a/hosts/conduwuit/default.nix b/hosts/conduwuit/default.nix deleted file mode 100644 index 0f556b8..0000000 --- a/hosts/conduwuit/default.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ config, lib, ... }: -let - mac = "02:00:00:00:00:06"; -in -{ - imports = [ - ./conduwuit.nix - ]; - sops.defaultSopsFile = ./secrets.yaml; - sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; - - sops.secrets = { - "wg/0xa-proxy" = { - owner = config.users.users.systemd-network.name; - }; - }; - - microvm = { - hypervisor = "cloud-hypervisor"; - vsock.cid = 3 + 6; - mem = 3 * 1024; - vcpu = 2; - interfaces = [ - { - type = "tap"; - id = "uvm-conduwuit"; - mac = mac; - } - ]; - shares = [ - { - source = "/nix/store"; - mountPoint = "/nix/.ro-store"; - tag = "store"; - proto = "virtiofs"; - socket = "store.socket"; - } - ] - ++ - map - (dir: { - source = dir; - mountPoint = "/${dir}"; - tag = dir; - proto = "virtiofs"; - socket = "${dir}.socket"; - }) - [ - "etc" - "var" - "home" - ]; - }; - - networking.useNetworkd = true; - networking.firewall.enable = lib.mkForce false; # firewalling done by the host - - systemd.network = { - enable = true; - networks."11-host" = { - matchConfig.MACAddress = mac; - networkConfig = { - Address = "10.99.99.16/24"; - DHCP = "no"; - }; - routes = [ - { - Gateway = "10.99.99.1"; - Destination = "0.0.0.0/0"; - Metric = 1024; - } - ]; - }; - }; - - networking.hostName = "conduwuit"; - system.stateVersion = "24.11"; -} diff --git a/hosts/conduwuit/secrets.yaml b/hosts/conduwuit/secrets.yaml deleted file mode 100644 index 452ca16..0000000 --- a/hosts/conduwuit/secrets.yaml +++ /dev/null @@ -1,37 +0,0 @@ -wg: - 0xa-proxy: ENC[AES256_GCM,data:e09UIAn928uOf6asUaFSg0VDoeShWGyd1c5gF0O0nwVEk/1ldVvaIyWMcwk=,iv:FS+LAI0S5XOOQO4WVpNfEUIxYHGY1YT6mITh8FpSiZU=,tag:1eM6wN98D3Bz0XlikCu5Gg==,type:str] -sops: - age: - - recipient: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJl9iYG5oHBq/poBn7Jf1/FGWWbAnbx+NKjs7qtT3uAK - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IHowb2lXdyBQYXJG - Z2xYL1IvY1V5RDA3MDZCMWpXWEFiOHovNllZRVB0TlVlN1pwdFg0CjlqN2ZsSzNq - VjhnMGpjT0lmSTk4NHV1aXNvYlJTUEFZTi81TWpVVVRFZWsKLS0tIGpmYUFsc0tM - MHFqNHdiMnFzUXp6WitBcUZmaTJoVHN4cGpucE9mQ25NVkUKz3MfVWhDdViyVW2k - 9EaCQbmTQoK3ilVKtG2KPynVXMaHVCg5NXtKqwdXwnHM5SaQIYONLNWGoj6B0Sz5 - jFUKPQ== - -----END AGE ENCRYPTED FILE----- - - recipient: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAXrwZsBChUhVuF5gFEfj8GwQlnrqEttAytS5jVCfuE4 0xa@frituurpan - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFlJOElMUSBRQzhN - dDVuY1JJQzFjOHViaThSUU9ucUVlY1A0cS9aMWgydE1EN01VWlRFCml4N2pubVhv - ajlvOHp2SkdQM2xpMjBwd2dFbzN0b250Q2VMeVZTcUM3TW8KLS0tIFVySVVKQWR4 - QnFCNExIZEtZakwzekFORjRINlpSdjFYNDJyVDF4OUd0Nk0KhqX2zSNmS9iv5PmA - 0zgy/OnXxzVQ4tfht0jNyqw1BFLxgCoPL7UPguBhD0yEeD1SAnmOQfx5sIw4yOmp - MP3elw== - -----END AGE ENCRYPTED FILE----- - - recipient: age1vd78txz0chk8sum3tceamg7u6enzcclh3vnpjswyrmarvmdmp46qdx7mqt - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWdmtVQWZQOUFjbVlIWXdL - UFBRNTNobWFuSGtRc0ViL2VpYVgzem1lY1hRClpOWmVZUXhIcDFnanZPa1R2V0Zj - Zi92T0JuamZIMlpSWDVMZnVJcmRoMzgKLS0tIFNrQTV4NloxUFY3cHlRd3VUVTFN - TUE1eG1QN3F0YjNIYXI0cURSWDRHemcKm/ATwZaK3inWv16CqxfNkYI4SuZUwxc3 - o6kuJgUr5AHy5LhFZebhBxJZPxlG20D4Ib4FD3kqrqXZyPy4I+0g6g== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-02-05T20:41:18Z" - mac: ENC[AES256_GCM,data:LPaVDxkZF3hlDIemauZpGngWspGzLINuhI4UIdP1+vP5gX0EBVhpZWty9wCSfJEeuU1ycKPJFAok0A3hgLbXQdjlvTxW/ba5g3hvVHEoyCXPrOPZiEK2EsFZRaM99tMOijBODVHkGhRY2O0sms0OLs+oQg6A+9fe14+dZxoUjWw=,iv:spAY8/Ghs8XhbNgKB8NQILC/qC8tBPiInnOOzfnuxZI=,tag:cLAmIvb4p0Sz2IIEk98/rg==,type:str] - unencrypted_suffix: _unencrypted - version: 3.9.4 -- cgit v1.3.1