lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

outline: 0.87.3 -> 0.87.4 (#444287)

authored by

Cabia Rangris and committed by
GitHub
320f897d 38d19f79

+14 -43
+1 -1
nixos/modules/services/web-apps/outline.nix
··· 702 702 FORCE_HTTPS = builtins.toString cfg.forceHttps; 703 703 ENABLE_UPDATES = builtins.toString cfg.enableUpdateCheck; 704 704 WEB_CONCURRENCY = builtins.toString cfg.concurrency; 705 - MAXIMUM_IMPORT_SIZE = builtins.toString cfg.maximumImportSize; 706 705 DEBUG = cfg.debugOutput; 707 706 GOOGLE_ANALYTICS_ID = lib.optionalString (cfg.googleAnalyticsId != null) cfg.googleAnalyticsId; 708 707 SENTRY_DSN = lib.optionalString (cfg.sentryDsn != null) cfg.sentryDsn; ··· 715 714 RATE_LIMITER_DURATION_WINDOW = builtins.toString cfg.rateLimiter.durationWindow; 716 715 717 716 FILE_STORAGE = cfg.storage.storageType; 717 + FILE_STORAGE_IMPORT_MAX_SIZE = builtins.toString cfg.maximumImportSize; 718 718 FILE_STORAGE_UPLOAD_MAX_SIZE = builtins.toString cfg.storage.uploadMaxSize; 719 719 FILE_STORAGE_LOCAL_ROOT_DIR = cfg.storage.localRootDir; 720 720 }
+10 -39
nixos/tests/outline.nix
··· 1 - { pkgs, lib, ... }: 2 - let 3 - accessKey = "BKIKJAA5BMMU2RHO6IBB"; 4 - secretKey = "V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12"; 5 - secretKeyFile = pkgs.writeText "outline-secret-key" '' 6 - ${secretKey} 7 - ''; 8 - rootCredentialsFile = pkgs.writeText "minio-credentials-full" '' 9 - MINIO_ROOT_USER=${accessKey} 10 - MINIO_ROOT_PASSWORD=${secretKey} 11 - ''; 12 - in 1 + { lib, ... }: 13 2 { 14 3 name = "outline"; 15 4 ··· 17 6 18 7 node.pkgsReadOnly = false; 19 8 20 - nodes.outline = 21 - { pkgs, config, ... }: 22 - { 23 - nixpkgs.config.allowUnfree = true; 24 - environment.systemPackages = [ pkgs.minio-client ]; 25 - services.outline = { 26 - enable = true; 27 - forceHttps = false; 28 - storage = { 29 - inherit accessKey secretKeyFile; 30 - uploadBucketUrl = "http://localhost:9000"; 31 - uploadBucketName = "outline"; 32 - region = config.services.minio.region; 33 - }; 34 - }; 35 - services.minio = { 36 - enable = true; 37 - inherit rootCredentialsFile; 9 + nodes.outline = { 10 + virtualisation.memorySize = 2 * 1024; 11 + nixpkgs.config.allowUnfree = true; 12 + services.outline = { 13 + enable = true; 14 + forceHttps = false; 15 + storage = { 16 + storageType = "local"; 38 17 }; 39 18 }; 19 + }; 40 20 41 21 testScript = '' 42 - machine.wait_for_unit("minio.service") 43 - machine.wait_for_open_port(9000) 44 - 45 - # Create a test bucket on the server 46 - machine.succeed( 47 - "mc alias set minio http://localhost:9000 ${accessKey} ${secretKey} --api s3v4" 48 - ) 49 - machine.succeed("mc mb minio/outline") 50 - 51 22 outline.wait_for_unit("outline.service") 52 23 outline.wait_for_open_port(3000) 53 24 outline.succeed("curl --fail http://localhost:3000/")
+3 -3
pkgs/servers/web-apps/outline/default.nix
··· 14 14 15 15 stdenv.mkDerivation rec { 16 16 pname = "outline"; 17 - version = "0.87.3"; 17 + version = "0.87.4"; 18 18 19 19 src = fetchFromGitHub { 20 20 owner = "outline"; 21 21 repo = "outline"; 22 22 rev = "v${version}"; 23 - hash = "sha256-hayA8zYSl4PFRlsK6n2881eef2J9Oy3FhiMFgdFgONY="; 23 + hash = "sha256-gsQPDbKTzsXV8y8/xMxmhJM6pI+zDkx/r1Zk83ixb7k="; 24 24 }; 25 25 26 26 nativeBuildInputs = [ ··· 35 35 36 36 yarnOfflineCache = fetchYarnDeps { 37 37 yarnLock = "${src}/yarn.lock"; 38 - hash = "sha256-1u9/I1H2BsUS5qPwNAdCrug3ekCTyWHd60kR9FXugV0="; 38 + hash = "sha256-/bWDFIGElBc1lMODKTxmSkal9c4L1iTPd521/DVYyxo="; 39 39 }; 40 40 41 41 configurePhase = ''