From 086952163490a2a8a4883aa2a5c30256266b83fa Mon Sep 17 00:00:00 2001 From: Rory& Date: Thu, 4 Jul 2024 16:42:15 +0200 Subject: Set default nginx virtualhost --- host/Rory-nginx/services/matrix/synapse/workers/module.nix | 1 + host/Rory-nginx/services/matrix/synapse/workers/user-dir.nix | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/host/Rory-nginx/services/matrix/synapse/workers/module.nix b/host/Rory-nginx/services/matrix/synapse/workers/module.nix index 903f452..84b8a87 100644 --- a/host/Rory-nginx/services/matrix/synapse/workers/module.nix +++ b/host/Rory-nginx/services/matrix/synapse/workers/module.nix @@ -63,6 +63,7 @@ in nginxVirtualHostName = lib.mkOption { type = lib.types.str; + default = null; description = "The virtual host name for the nginx server"; }; }; diff --git a/host/Rory-nginx/services/matrix/synapse/workers/user-dir.nix b/host/Rory-nginx/services/matrix/synapse/workers/user-dir.nix index 4a097af..4d5069b 100644 --- a/host/Rory-nginx/services/matrix/synapse/workers/user-dir.nix +++ b/host/Rory-nginx/services/matrix/synapse/workers/user-dir.nix @@ -46,7 +46,6 @@ in ]; } ]; - database = ( import ../db.nix { workerName = "user_dir"; @@ -57,7 +56,7 @@ in }; }; - services.nginx.virtualHosts."${nginxVirtualHostName}" = { + services.nginx.virtualHosts."${cfg.nginxVirtualHostName}" = { locations."^/_matrix/client/(api/v1|r0|v3|unstable)/user_directory/search$" = { proxyPass = "http://unix:/run/matrix-synapse/user_dir-client.sock"; }; -- cgit 1.4.1