diff --git a/hosts/hub/apps/gts.nix b/hosts/hub/apps/gts.nix index 713b1cb..2ef953a 100644 --- a/hosts/hub/apps/gts.nix +++ b/hosts/hub/apps/gts.nix @@ -17,7 +17,9 @@ in }; caddy.virtualHosts."gts.thewordnerd.info".extraConfig = '' - reverse_proxy http://localhost:8081 + reverse_proxy http://localhost:8081 { + flush_interval -1 + } ''; }; environment.systemPackages = [ package ]; diff --git a/hosts/hub/apps/nextcloud.nix b/hosts/hub/apps/nextcloud.nix index fd45046..97371d5 100644 --- a/hosts/hub/apps/nextcloud.nix +++ b/hosts/hub/apps/nextcloud.nix @@ -61,12 +61,14 @@ }; virtualisation.docker.enable = true; users.users.nextcloud.extraGroups = [ "docker" ]; - environment.systemPackages = [ + environment.systemPackages = with pkgs; [ + poppler_utils (pkgs.writeScriptBin "occ" '' #!${pkgs.bash}/bin/bash exec nextcloud-occ "$@" '') ]; + programs.java.binfmt = true; system.stateVersion = "24.11"; }; # https://discourse.nixos.org/t/podman-docker-in-nixos-container-ideally-in-unprivileged-one/22909/12 diff --git a/hosts/hub/default.nix b/hosts/hub/default.nix index 693c548..204be3a 100644 --- a/hosts/hub/default.nix +++ b/hosts/hub/default.nix @@ -126,8 +126,25 @@ 443 ]; - services.caddy.virtualHosts."thewordnerd.info".extraConfig = - ''redir https://www.thewordnerd.info{uri}''; + services.caddy.virtualHosts."thewordnerd.info".extraConfig = '' + @webfinger { + path /.well-known/webfinger + # query acct=nolan%3Athewordnerd%40info + } + handle @webfinger { + rewrite * /.well-known/webfinger?resource=acct%3Anolan%40gts.thewordnerd.info + reverse_proxy localhost:8081 + } + handle /.well-known/nodeinfo { + reverse_proxy localhost:8081 + } + handle /.well-known/host-meta { + reverse_proxy localhost:8081 + } + handle { + redir https://www.thewordnerd.info{uri} + } + ''; services.caddy.virtualHosts."www.thewordnerd.info".extraConfig = '' file_server diff --git a/users/root.nix b/users/root.nix index bf78610..920c822 100644 --- a/users/root.nix +++ b/users/root.nix @@ -19,5 +19,6 @@ }; stateVersion = "24.11"; }; + services.ssh-agent.enable = true; }; }