diff --git a/config/hosts/wind/data/secrets/secrets.nix b/config/hosts/wind/data/secrets/secrets.nix index d95a37c..47c5c6e 100644 Binary files a/config/hosts/wind/data/secrets/secrets.nix and b/config/hosts/wind/data/secrets/secrets.nix differ diff --git a/config/hosts/wind/data/secrets/synapse_extra_config b/config/hosts/wind/data/secrets/synapse_extra_config index 2b6eb7a..3408305 100644 Binary files a/config/hosts/wind/data/secrets/synapse_extra_config and b/config/hosts/wind/data/secrets/synapse_extra_config differ diff --git a/config/hosts/wind/data/secrets/synapse_sliding_sync_env b/config/hosts/wind/data/secrets/synapse_sliding_sync_env new file mode 100644 index 0000000..b5b3eec Binary files /dev/null and b/config/hosts/wind/data/secrets/synapse_sliding_sync_env differ diff --git a/config/hosts/wind/services/nginx.nix b/config/hosts/wind/services/nginx.nix index 875a586..f6e97e6 100644 --- a/config/hosts/wind/services/nginx.nix +++ b/config/hosts/wind/services/nginx.nix @@ -5,9 +5,14 @@ enableACME = true; forceSSL = true; locations."/".root = "/var/www/graven.dev/public"; - locations."~ ^(\\/_matrix|\\/_synapse\\/client)".proxyPass = "http://127.0.0.1:8008"; - locations."~ ^(\\/_matrix|\\/_synapse\\/client)".proxyPass = "http://127.0.0.1:8008"; - locations."~ ^/(client/|_matrix/client/unstable/org.matrix.msc3575/sync)".proxyPass = "http://127.0.0.1:8009"; + locations."~ ^/(client|_matrix/client/unstable/org.matrix.msc3575/sync)" = { + proxyPass = "http://127.0.0.1:8009"; + priority = 900; + }; + locations."~ ^(\\/_matrix|\\/_synapse\\/client)" = { + proxyPass = "http://127.0.0.1:8008"; + priority = 1000; + }; locations."/.well-known/matrix/" = { root = "/var/www/matrix/public"; extraConfig = '' diff --git a/config/hosts/wind/services/synapse.nix b/config/hosts/wind/services/synapse.nix index 8e236e2..48cb0b0 100644 --- a/config/hosts/wind/services/synapse.nix +++ b/config/hosts/wind/services/synapse.nix @@ -8,6 +8,7 @@ sliding-sync = { enable = true; settings.SYNCV3_SERVER = "https://graven.dev"; + environmentFile = builtins.toString config.secrets.files.synapse_sliding_sync_env.file; }; settings = { server_name = "graven.dev";