diff options
author | zimbatm <zimbatm@zimbatm.com> | 2020-06-09 23:54:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-09 23:54:54 +0200 |
commit | 9494fdeeb323e3f969eaab717dd9b9d6b7524378 (patch) | |
tree | 40e15f19f0dc533a88d2a1a7ea3f6bffb1212965 /nixos | |
parent | 168846fa8ec3a4649aefdc7cea9b7a65e5270ece (diff) | |
parent | cd92184f3de50335c54cec707c5fa9a40e50a3f4 (diff) | |
download | nixlib-9494fdeeb323e3f969eaab717dd9b9d6b7524378.tar nixlib-9494fdeeb323e3f969eaab717dd9b9d6b7524378.tar.gz nixlib-9494fdeeb323e3f969eaab717dd9b9d6b7524378.tar.bz2 nixlib-9494fdeeb323e3f969eaab717dd9b9d6b7524378.tar.lz nixlib-9494fdeeb323e3f969eaab717dd9b9d6b7524378.tar.xz nixlib-9494fdeeb323e3f969eaab717dd9b9d6b7524378.tar.zst nixlib-9494fdeeb323e3f969eaab717dd9b9d6b7524378.zip |
Merge pull request #70327 from abbradar/synapse-plugins
Refactor Synapse plugins, add matrix-synapse-pam
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/misc/matrix-synapse.nix | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index 703bc9416f88..8ed4bbdd031c 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -9,6 +9,9 @@ let logConfigFile = pkgs.writeText "log_config.yaml" cfg.logConfig; mkResource = r: ''{names: ${builtins.toJSON r.names}, compress: ${boolToString r.compress}}''; mkListener = l: ''{port: ${toString l.port}, bind_address: "${l.bind_address}", type: ${l.type}, tls: ${boolToString l.tls}, x_forwarded: ${boolToString l.x_forwarded}, resources: [${concatStringsSep "," (map mkResource l.resources)}]}''; + pluginsEnv = cfg.package.python.buildEnv.override { + extraLibs = cfg.plugins; + }; configFile = pkgs.writeText "homeserver.yaml" '' ${optionalString (cfg.tls_certificate_path != null) '' tls_certificate_path: "${cfg.tls_certificate_path}" @@ -125,6 +128,14 @@ in { Overridable attribute of the matrix synapse server package to use. ''; }; + plugins = mkOption { + type = types.listOf types.package; + default = [ ]; + defaultText = "with config.services.matrix-synapse.package.plugins [ matrix-synapse-ldap3 matrix-synapse-pam ]"; + description = '' + List of additional Matrix plugins to make available. + ''; + }; no_tls = mkOption { type = types.bool; default = false; @@ -686,6 +697,7 @@ in { --keys-directory ${cfg.dataDir} \ --generate-keys ''; + environment.PYTHONPATH = makeSearchPathOutput "lib" cfg.package.python.sitePackages [ pluginsEnv ]; serviceConfig = { Type = "notify"; User = "matrix-synapse"; |