diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-05-03 00:13:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-03 00:13:16 +0000 |
| commit | 26d2f291dffdcb7e5f40896be3fc3bc72538dbd0 (patch) | |
| tree | 5eab6c80968fb769f5433bc2fa6b96f102d17701 /nixos/modules/virtualisation/podman/default.nix | |
| parent | 2918b2c876b74d0ba5e333676ee86228f51c24e8 (diff) | |
| parent | 172094c8c1f83ee7f6d7dd10e64fdc7da0e4ac3b (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'nixos/modules/virtualisation/podman/default.nix')
| -rw-r--r-- | nixos/modules/virtualisation/podman/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/virtualisation/podman/default.nix b/nixos/modules/virtualisation/podman/default.nix index 4b1b67ac9444e..deb0b4d2c5bd7 100644 --- a/nixos/modules/virtualisation/podman/default.nix +++ b/nixos/modules/virtualisation/podman/default.nix @@ -219,6 +219,11 @@ in systemd.services.podman.environment = config.networking.proxy.envVars; systemd.sockets.podman.wantedBy = [ "sockets.target" ]; systemd.sockets.podman.socketConfig.SocketGroup = "podman"; + # Podman does not support multiple sockets, as of podman 5.0.2, so we use + # a symlink. Unfortunately this does not let us use an alternate group, + # such as `docker`. + systemd.sockets.podman.socketConfig.Symlinks = + lib.mkIf cfg.dockerSocket.enable [ "/run/docker.sock" ]; systemd.user.services.podman.environment = config.networking.proxy.envVars; systemd.user.sockets.podman.wantedBy = [ "sockets.target" ]; @@ -239,11 +244,6 @@ in '') ]; - systemd.tmpfiles.rules = - lib.optionals cfg.dockerSocket.enable [ - "L! /run/docker.sock - - - - /run/podman/podman.sock" - ]; - users.groups.podman = { }; assertions = [ |