diff --git a/flake.lock b/flake.lock index 10091ea..1bb48ae 100644 --- a/flake.lock +++ b/flake.lock @@ -1,44 +1,5 @@ { "nodes": { - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "home": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1711535911, - "narHash": "sha256-SzgDrsyBskLyipFzsKwPOKP9FMgGB+6tUQ0VpeGQ/1Y=", - "ref": "refs/heads/main", - "rev": "80221fa4d735fbc232d97d3384c8af0e40a4e331", - "revCount": 9, - "type": "git", - "url": "https://git.sondell.org/glennwso/home.git" - }, - "original": { - "type": "git", - "url": "https://git.sondell.org/glennwso/home.git" - } - }, "nixpkgs": { "locked": { "lastModified": 1709237383, @@ -57,24 +18,8 @@ }, "root": { "inputs": { - "home": "home", "nixpkgs": "nixpkgs" } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/matrix.nix b/matrix.nix index 5957519..cc2d4c5 100644 --- a/matrix.nix +++ b/matrix.nix @@ -2,7 +2,6 @@ let domain = "sondell.org"; - matrixAdress = "m.${domain}"; hostName = "matrix"; fqdn = "${hostName}.${domain}"; baseUrl = "https://${fqdn}"; @@ -53,8 +52,8 @@ services.postgresql = { services.nginx.virtualHosts = { ${fqdn} = { - # enableACME = true; - # forceSSL = true; + enableACME = true; + forceSSL = true; locations."/".extraConfig = '' return 404; ''; @@ -65,21 +64,21 @@ services.postgresql = { locations."/_synapse/client".proxyPass = "http://[::1]:8008"; }; - ${matrixAdress} = { - # enableACME = true; - # forceSSL = true; + ${domain} = { + 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 + # 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; - # # 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 + # 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; }; };