diff --git a/nixos/modules/services/web-apps/outline.nix b/nixos/modules/services/web-apps/outline.nix index 9aa1fb09a43a..e61ef35df28e 100644 --- a/nixos/modules/services/web-apps/outline.nix +++ b/nixos/modules/services/web-apps/outline.nix @@ -702,7 +702,6 @@ in FORCE_HTTPS = builtins.toString cfg.forceHttps; ENABLE_UPDATES = builtins.toString cfg.enableUpdateCheck; WEB_CONCURRENCY = builtins.toString cfg.concurrency; - MAXIMUM_IMPORT_SIZE = builtins.toString cfg.maximumImportSize; DEBUG = cfg.debugOutput; GOOGLE_ANALYTICS_ID = lib.optionalString (cfg.googleAnalyticsId != null) cfg.googleAnalyticsId; SENTRY_DSN = lib.optionalString (cfg.sentryDsn != null) cfg.sentryDsn; @@ -715,6 +714,7 @@ in RATE_LIMITER_DURATION_WINDOW = builtins.toString cfg.rateLimiter.durationWindow; FILE_STORAGE = cfg.storage.storageType; + FILE_STORAGE_IMPORT_MAX_SIZE = builtins.toString cfg.maximumImportSize; FILE_STORAGE_UPLOAD_MAX_SIZE = builtins.toString cfg.storage.uploadMaxSize; FILE_STORAGE_LOCAL_ROOT_DIR = cfg.storage.localRootDir; } diff --git a/nixos/tests/outline.nix b/nixos/tests/outline.nix index 58c751d66f78..9dc6bab39ecc 100644 --- a/nixos/tests/outline.nix +++ b/nixos/tests/outline.nix @@ -1,15 +1,4 @@ -{ pkgs, lib, ... }: -let - accessKey = "BKIKJAA5BMMU2RHO6IBB"; - secretKey = "V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12"; - secretKeyFile = pkgs.writeText "outline-secret-key" '' - ${secretKey} - ''; - rootCredentialsFile = pkgs.writeText "minio-credentials-full" '' - MINIO_ROOT_USER=${accessKey} - MINIO_ROOT_PASSWORD=${secretKey} - ''; -in +{ lib, ... }: { name = "outline"; @@ -17,37 +6,19 @@ in node.pkgsReadOnly = false; - nodes.outline = - { pkgs, config, ... }: - { - nixpkgs.config.allowUnfree = true; - environment.systemPackages = [ pkgs.minio-client ]; - services.outline = { - enable = true; - forceHttps = false; - storage = { - inherit accessKey secretKeyFile; - uploadBucketUrl = "http://localhost:9000"; - uploadBucketName = "outline"; - region = config.services.minio.region; - }; - }; - services.minio = { - enable = true; - inherit rootCredentialsFile; + nodes.outline = { + virtualisation.memorySize = 2 * 1024; + nixpkgs.config.allowUnfree = true; + services.outline = { + enable = true; + forceHttps = false; + storage = { + storageType = "local"; }; }; + }; testScript = '' - machine.wait_for_unit("minio.service") - machine.wait_for_open_port(9000) - - # Create a test bucket on the server - machine.succeed( - "mc alias set minio http://localhost:9000 ${accessKey} ${secretKey} --api s3v4" - ) - machine.succeed("mc mb minio/outline") - outline.wait_for_unit("outline.service") outline.wait_for_open_port(3000) outline.succeed("curl --fail http://localhost:3000/") diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix index ecdd6f5a169e..a2f9025ba9d3 100644 --- a/pkgs/servers/web-apps/outline/default.nix +++ b/pkgs/servers/web-apps/outline/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "outline"; - version = "0.87.3"; + version = "0.87.4"; src = fetchFromGitHub { owner = "outline"; repo = "outline"; rev = "v${version}"; - hash = "sha256-hayA8zYSl4PFRlsK6n2881eef2J9Oy3FhiMFgdFgONY="; + hash = "sha256-gsQPDbKTzsXV8y8/xMxmhJM6pI+zDkx/r1Zk83ixb7k="; }; nativeBuildInputs = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-1u9/I1H2BsUS5qPwNAdCrug3ekCTyWHd60kR9FXugV0="; + hash = "sha256-/bWDFIGElBc1lMODKTxmSkal9c4L1iTPd521/DVYyxo="; }; configurePhase = ''