diff options
Diffstat (limited to 'hosts/vps')
| -rw-r--r-- | hosts/vps/matrix.nix | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/hosts/vps/matrix.nix b/hosts/vps/matrix.nix index f47f149..335d304 100644 --- a/hosts/vps/matrix.nix +++ b/hosts/vps/matrix.nix @@ -27,11 +27,11 @@ # networking.firewall.allowedTCPPorts = [80 443]; age.secrets.matrix = { - file = ../../secrets/matrix.age; - mode = "600"; - owner = "root"; - group = "root"; - }; + file = ../../secrets/matrix.age; + mode = "600"; + owner = "root"; + group = "root"; + }; services.dendrite = let database_config = { @@ -44,7 +44,6 @@ loadCredential = ["private_key:${config.age.secrets.matrix.path}" "tlsCert:/var/lib/caddy/.local/share/caddy/certificates/acme-v02.api.letsencrypt.org-directory/tzlil.net/tzlil.net.crt" "tlsKey:/var/lib/caddy/.local/share/caddy/certificates/acme-v02.api.letsencrypt.org-directory/tzlil.net/tzlil.net.key"]; - # tlsCert = "$CREDENTIALS_DIRECTORY/tlsCert"; # tlsKey = "$CREDENTIALS_DIRECTORY/tlsKey"; @@ -100,13 +99,14 @@ }; }; - systemd.services.dendrite.serviceConfig.ExecStart = lib.mkForce (lib.strings.concatStringsSep " " ([ - "${pkgs.dendrite}/bin/dendrite-monolith-server" - "--config /run/dendrite/dendrite.yaml" - "--http-bind-address :8008" - "--https-bind-address :8448" - "--tls-cert $CREDENTIALS_DIRECTORY/tlsCert" - "--tls-key $CREDENTIALS_DIRECTORY/tlsKey"])); + systemd.services.dendrite.serviceConfig.ExecStart = lib.mkForce (lib.strings.concatStringsSep " " [ + "${pkgs.dendrite}/bin/dendrite-monolith-server" + "--config /run/dendrite/dendrite.yaml" + "--http-bind-address :8008" + "--https-bind-address :8448" + "--tls-cert $CREDENTIALS_DIRECTORY/tlsCert" + "--tls-key $CREDENTIALS_DIRECTORY/tlsKey" + ]); services.postgresql = { enable = true; @@ -141,7 +141,6 @@ systemd.services.dendrite.after = ["postgresql.service"]; - services.caddy = { # for federation virtualHosts."tzlil.net:8448".extraConfig = '' |