nixos/incus: drop option to gate bucket support
This reverts commit 4426551578.
This commit is contained in:
@@ -77,6 +77,10 @@ let
|
||||
++ lib.optionals (lib.versionAtLeast cfg.package.version "6.11.0") [
|
||||
lego
|
||||
]
|
||||
++ lib.optionals (lib.versionOlder cfg.package.version "7.0.0") [
|
||||
minio
|
||||
minio-client
|
||||
]
|
||||
++ lib.optionals config.security.apparmor.enable [
|
||||
apparmor-bin-utils
|
||||
|
||||
@@ -97,10 +101,6 @@ let
|
||||
]
|
||||
++ lib.optionals nvidiaEnabled [
|
||||
libnvidia-container
|
||||
]
|
||||
++ lib.optionals cfg.bucketSupport [
|
||||
minio
|
||||
minio-client
|
||||
];
|
||||
|
||||
# https://github.com/lxc/incus/blob/cff35a29ee3d7a2af1f937cbb6cf23776941854b/internal/server/instance/drivers/driver_qemu.go#L123
|
||||
@@ -213,13 +213,6 @@ in
|
||||
description = "The incus client package to use. This package is added to PATH.";
|
||||
};
|
||||
|
||||
bucketSupport = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
description = "Enable bucket support using minio, which is an insecure and unmaintained S3 provider.";
|
||||
default = if lib.versionAtLeast config.system.stateVersion "26.11" then false else null;
|
||||
defaultText = lib.literalExpression ''if lib.versionAtLeast config.system.stateVersion "26.11" then false else null;'';
|
||||
};
|
||||
|
||||
softDaemonRestart = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
@@ -573,4 +566,10 @@ in
|
||||
|
||||
virtualisation.lxc.lxcfs.enable = true;
|
||||
};
|
||||
|
||||
imports = [
|
||||
(lib.mkRemovedOptionModule [ "virtualisation" "incus" "bucketSupport" ] ''
|
||||
The option was only a temporary workaround to gate the insecure minio dependency until it could be dropped.
|
||||
'')
|
||||
];
|
||||
}
|
||||
|
||||
@@ -51,7 +51,6 @@ in
|
||||
incus = {
|
||||
enable = true;
|
||||
package = cfg.package;
|
||||
bucketSupport = false;
|
||||
|
||||
preseed = {
|
||||
networks = [
|
||||
|
||||
Reference in New Issue
Block a user