From 4eb4b439d0a9442195ec49a94299ef02de19fb7e Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 27 Mar 2024 15:30:23 +0100 Subject: [PATCH] disable dubble tls --- matrix.nix | 19 ++++++++++--------- nextcloud.nix | 9 +++++++++ 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/matrix.nix b/matrix.nix index 41aaa84..5957519 100644 --- a/matrix.nix +++ b/matrix.nix @@ -2,6 +2,7 @@ let domain = "sondell.org"; + matrixAdress = "m.${domain}"; hostName = "matrix"; fqdn = "${hostName}.${domain}"; baseUrl = "https://${fqdn}"; @@ -64,23 +65,23 @@ services.postgresql = { locations."/_synapse/client".proxyPass = "http://[::1]:8008"; }; - # ${domain} = { - # # enableACME = true; - # # forceSSL = true; - # locations."/" = { - # proxyPass = "http://localhost:8008"; - # }; + ${matrixAdress} = { + # enableACME = true; + # forceSSL = true; + locations."/" = { + proxyPass = "http://localhost:8008"; + }; # # This section is not needed if the server_name of matrix-synapse is equal to # # the domain (i.e. example.org from @foo:example.org) and the federation port # # is 8448. # # Further reference can be found in the docs about delegation under # # https://element-hq.github.io/synapse/latest/delegate.html - # locations."= /.well-known/matrix/server".extraConfig = mkWellKnown serverConfig; + locations."= /.well-known/matrix/server".extraConfig = mkWellKnown serverConfig; # # This is usually needed for homeserver discovery (from e.g. other Matrix clients). # # Further reference can be found in the upstream docs at # # https://spec.matrix.org/latest/client-server-api/#getwell-knownmatrixclient - # locations."= /.well-known/matrix/client".extraConfig = mkWellKnown clientConfig; - # }; + locations."= /.well-known/matrix/client".extraConfig = mkWellKnown clientConfig; + }; }; } diff --git a/nextcloud.nix b/nextcloud.nix index e3b8382..2c82b49 100644 --- a/nextcloud.nix +++ b/nextcloud.nix @@ -39,6 +39,15 @@ in https = true; autoUpdateApps.enable = true; extraAppsEnable = true; + extraOptions = { + redis = { + host = "/run/redis/redis.sock"; + port = 0; + dbindex = 0; + password = "secret"; + timeout = 1.5; + }; + }; extraApps = with config.services.nextcloud.package.packages.apps; { # List of apps we want to install and are already packaged in # https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/nextcloud/packages/nextcloud-apps.json