diff --git a/nixos/boxes/bolty/default.nix b/nixos/boxes/bolty/default.nix index 91cfda21..f4bec0e4 100644 --- a/nixos/boxes/bolty/default.nix +++ b/nixos/boxes/bolty/default.nix @@ -12,7 +12,6 @@ ./print-server.nix ./real-hardware.nix ./restic-server.nix - ./search.nix ./tailscale-cert.nix ./virtualisation.nix ]; diff --git a/nixos/boxes/bolty/search.nix b/nixos/boxes/bolty/search.nix deleted file mode 100644 index 8711f195..00000000 --- a/nixos/boxes/bolty/search.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ config, pkgs, ... }: { - imports = [ ../nginx.nix ]; - - networking.firewall.allowedTCPPorts = [ 8888 ]; - virtualisation.oci-containers.containers.searxng = { - image = - "searxng/searxng@sha256:650c0b183a129e10c2493126bb27c3541ffebbead6e0255fab91831457211b06"; - volumes = [ ]; - environment = { BASE_URL = "https://search.cyplo.dev"; }; - ports = [ "8888:8080" ]; - }; -} diff --git a/nixos/boxes/mb1/default.nix b/nixos/boxes/mb1/default.nix index 70641b88..ea117510 100644 --- a/nixos/boxes/mb1/default.nix +++ b/nixos/boxes/mb1/default.nix @@ -5,6 +5,7 @@ ./atuin.nix ./boot.nix ./disks.nix + ./search.nix ]; networking.hostName = "mb1"; diff --git a/nixos/boxes/vpsfree1/search.nix b/nixos/boxes/mb1/search.nix similarity index 63% rename from nixos/boxes/vpsfree1/search.nix rename to nixos/boxes/mb1/search.nix index 136748de..a39d32e6 100644 --- a/nixos/boxes/vpsfree1/search.nix +++ b/nixos/boxes/mb1/search.nix @@ -1,5 +1,12 @@ { config, pkgs, ... }: { imports = [ ../nginx.nix ]; + virtualisation.oci-containers.containers.searxng = { + image = + "searxng/searxng@sha256:650c0b183a129e10c2493126bb27c3541ffebbead6e0255fab91831457211b06"; + volumes = [ ]; + environment = { BASE_URL = "https://search.cyplo.dev"; }; + ports = [ "9999:8080" ]; + }; services.nginx = { virtualHosts = { "search.cyplo.dev" = { @@ -15,7 +22,7 @@ proxy_buffer_size 256k; ''; locations."/" = { - proxyPass = "http://bolty:8888"; + proxyPass = "http://127.0.0.1:9999"; proxyWebsockets = true; }; }; diff --git a/nixos/boxes/vpsfree1/default.nix b/nixos/boxes/vpsfree1/default.nix index 9bf35aa4..02a4ab3e 100644 --- a/nixos/boxes/vpsfree1/default.nix +++ b/nixos/boxes/vpsfree1/default.nix @@ -13,7 +13,6 @@ ./mastodon.nix ./matrix-front.nix ./rss.nix - ./search.nix ./ssh.nix ./syncthing-relay.nix ];