diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2024-03-17 11:54:30 +0100 |
---|---|---|
committer | Maximilian Bosch <maximilian@mbosch.me> | 2024-03-30 14:23:05 +0100 |
commit | 5142b7afa88db6ccec229521ad96df4419f6abe4 (patch) | |
tree | bc2022b956505c4fb862c6d753ae4503efe7c3cf /nixos/tests/web-apps | |
parent | 8b152a2242d4f29de1c072f833ab941dd141c510 (diff) |
nixos/postgresql: turn `settings` into a submodule
The main idea behind that was to be able to do more sophisticated merging for stuff that goes into `postgresql.conf`: `shared_preload_libraries` is a comma-separated list in a `types.str` and thus not mergeable. With this change, the option accepts both a comma-separated string xor a list of strings. This can be implemented rather quick using `coercedTo` + freeform modules. The interface still behaves equally, but it allows to merge declarations for this option together. One side-effect was that I had to change the `attrsOf (oneOf ...)` part into a submodule to allow declaring options for certain things. While at it, I decided to move `log_line_prefix` and `port` into this structure as well.
Diffstat (limited to 'nixos/tests/web-apps')
-rw-r--r-- | nixos/tests/web-apps/mastodon/remote-databases.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/tests/web-apps/mastodon/remote-databases.nix b/nixos/tests/web-apps/mastodon/remote-databases.nix index fa6430a993531..55243658ec6a9 100644 --- a/nixos/tests/web-apps/mastodon/remote-databases.nix +++ b/nixos/tests/web-apps/mastodon/remote-databases.nix @@ -33,7 +33,7 @@ in extraHosts = hosts; firewall.allowedTCPPorts = [ config.services.redis.servers.mastodon.port - config.services.postgresql.port + config.services.postgresql.settings.port ]; }; |