From 848648a229302a9a96358c7e1ef0f19cf2f8669d Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 11 Aug 2022 00:02:33 +0200 Subject: [PATCH] matrix: add email support --- matrix.nix | 13 ++-- secrets/default.nix | 124 ++++++++++++++++++++------------------ secrets/matrix/email.pwd | 2 + secrets/matrix/email.yaml | 7 +++ 4 files changed, 83 insertions(+), 63 deletions(-) create mode 100644 secrets/matrix/email.pwd create mode 100644 secrets/matrix/email.yaml diff --git a/matrix.nix b/matrix.nix index dc3d212..68e573c 100644 --- a/matrix.nix +++ b/matrix.nix @@ -95,10 +95,10 @@ in # Connect to Postrges database_type = "psycopg2"; - database_args = { - user = "matrix-synapse"; - database = "matrix-synapse"; - }; + database_args = + { user = "matrix-synapse"; + database = "matrix-synapse"; + }; # Make logging less verbose log_config = pkgs.writeText "synapse-log.yml" '' @@ -128,12 +128,17 @@ in max_upload_size = "1000M"; turn_user_lifetime = "1d"; }; + # Secrets services.matrix-synapse.extraConfigFiles = [ # Needed to restrict access to the TURN # server to only our matrix users. config.secrets.matrix.turn.conf + # Password reset via email + # Note: can't be put here, see NixOS/nixpkgs#158605 + config.secrets.matrix.email.conf + # Needed by the register_new_matrix_user script config.secrets.matrix.registration ]; diff --git a/secrets/default.nix b/secrets/default.nix index c4ab13d..207a4df 100644 --- a/secrets/default.nix +++ b/secrets/default.nix @@ -1,59 +1,65 @@ -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 -JPKdqLMj1yxMEjd0uA== +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 +XPizas7pqmvyCZK0FXV9Wg== diff --git a/secrets/matrix/email.pwd b/secrets/matrix/email.pwd new file mode 100644 index 0000000..aaa497f --- /dev/null +++ b/secrets/matrix/email.pwd @@ -0,0 +1,2 @@ +U2FsdGVkX18z0J2fwZ9aJR7qoLXW1fmQCUqW0sVF9AMeWVVrkHFRO5FZWQUuMQ9s +fBLm3Q13bT9nM46wXg75DzB15gPmYN/m+4oePxk= diff --git a/secrets/matrix/email.yaml b/secrets/matrix/email.yaml new file mode 100644 index 0000000..db20e5e --- /dev/null +++ b/secrets/matrix/email.yaml @@ -0,0 +1,7 @@ +U2FsdGVkX18r1KmsRlmD3PA6ycT3FviUjhF4vrJ5mxrfTeVC0eZBHUqHJJ3c0UZ5 +wBbPGzN4tQWIlrIfFVHX+dsNkj3/OJtDh1pjoUAi/UkVzmzNnMWWfqh0wLHypk0l +mF+gWyVdzKSDHj0JKobobUgO3Bxq/MMNQmReJ9RgR+Z4D73L/V8Gmx8i867/ofoK +INZZhiUzQRHEz3LEOBL2Tbwzuq6YGS3KMf6lS3VlKeVO8SrXWz7C7Kbc+sehkD5P +Chi35s7zmF2sHJzIN3cio5WQnQkPcFIbTlLRPCE7Y46XyYep5qhlFJDVIswUFy2p +94XzyV+bFCrTR/rzGsZqhBZvkFuWV9UCqH/OFp0mQs+zxmElQrJldwUG+SI260U3 +qo2HnA5bRH+Qqp6UnafvWi0EbhnocbOHngg9pm26qOt0rrzmqzRmcw==