mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-13 13:40:28 +03:00
nixos/kanidm: Fix bind paths
1. We bound the directory of certificates, this lead to forced read-only
binds of these directories, even if they should have been bound
read-write for other files in there. Looking at the history, there
seems to be no compelling reason for this, so switch to binding
the files directly.
2. `/run/kanidmd` is configured as `RuntimeDirectory` so bound
automatically and we don’t need to specify it explicitly.
(cherry picked from commit c4f052c08a
)
This commit is contained in:
parent
fd714b47c7
commit
481131b7f4
1 changed files with 5 additions and 12 deletions
|
@ -54,15 +54,10 @@ let
|
|||
++ optional (cfg.provision.extraJsonFile != null) cfg.provision.extraJsonFile
|
||||
++ mapAttrsToList (_: x: x.basicSecretFile) cfg.provision.systems.oauth2
|
||||
);
|
||||
secretDirectories = unique (
|
||||
map builtins.dirOf (
|
||||
[
|
||||
cfg.serverSettings.tls_chain
|
||||
cfg.serverSettings.tls_key
|
||||
]
|
||||
++ optionals cfg.provision.enable provisionSecretFiles
|
||||
)
|
||||
);
|
||||
secretPaths = [
|
||||
cfg.serverSettings.tls_chain
|
||||
cfg.serverSettings.tls_key
|
||||
] ++ optionals cfg.provision.enable provisionSecretFiles;
|
||||
|
||||
# Merge bind mount paths and remove paths where a prefix is already mounted.
|
||||
# This makes sure that if e.g. the tls_chain is in the nix store and /nix/store is already in the mount
|
||||
|
@ -881,7 +876,7 @@ in
|
|||
(
|
||||
defaultServiceConfig
|
||||
// {
|
||||
BindReadOnlyPaths = mergePaths (defaultServiceConfig.BindReadOnlyPaths ++ secretDirectories);
|
||||
BindReadOnlyPaths = mergePaths (defaultServiceConfig.BindReadOnlyPaths ++ secretPaths);
|
||||
}
|
||||
)
|
||||
{
|
||||
|
@ -895,8 +890,6 @@ in
|
|||
|
||||
BindPaths =
|
||||
[
|
||||
# To create the socket
|
||||
"/run/kanidmd:/run/kanidmd"
|
||||
# To store backups
|
||||
cfg.serverSettings.online_backup.path
|
||||
]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue