diff --git a/machines/hippocampus/servers/public/caddy.nix b/machines/hippocampus/servers/public/caddy.nix index 247a335..195ba09 100644 --- a/machines/hippocampus/servers/public/caddy.nix +++ b/machines/hippocampus/servers/public/caddy.nix @@ -6,6 +6,7 @@ # acmeCA = "https://acme-staging-v02.api.letsencrypt.org/directory"; email = "davidcrompton1192@gmail.com"; }; + services.nginx.group = "caddy"; services.caddy.virtualHosts = { "star.zlinger.syzygial.cc" = { extraConfig = '' diff --git a/machines/hippocampus/servers/public/matrix/client.nix b/machines/hippocampus/servers/public/matrix/client.nix index 19dc56a..488177b 100644 --- a/machines/hippocampus/servers/public/matrix/client.nix +++ b/machines/hippocampus/servers/public/matrix/client.nix @@ -1,7 +1,7 @@ { config, pkgs, lib, ... }: { services.nginx.virtualHosts.cinny = { listen = [{ - addr = "unix:/run/cinny.sock"; + addr = "unix:/run/nginx/cinny.sock"; }]; locations."/" = { root = pkgs.cinny; @@ -20,15 +20,15 @@ }; }; services.caddy.virtualHosts = { - "glia.club" = { - extraConfig = '' - reverse_proxy unix//run/cinny.sock + "glia.club, glia.club:8448" = { + extraConfig = lib.mkAfter '' + reverse_proxy unix//run/nginx/cinny.sock ''; }; "chat.glia.club" = { extraConfig = '' - reverse_proxy unix//run/cinny.sock + reverse_proxy unix//run/nginx/cinny.sock ''; }; };