Merge master into staging-next

2022-12-28 06:01:38 +00:00
parent 5186cd8a55 dc0c7a8b9c
commit e9547e0c28
9 changed files with 48 additions and 17 deletions
@@ -42,7 +42,7 @@ in
        strings.  The latter is concatenated, interspersed with colon
        characters.
      '';
-      type = with types; attrsOf (oneOf [ str path (listOf str) ]);
+      type = with types; attrsOf (oneOf [ (listOf str) str path ]);
      apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else "${v}");
    };

@@ -211,19 +211,15 @@ in
    ];

    systemd.services.paperless-scheduler = {
-      description = "Paperless scheduler";
+      description = "Paperless Celery Beat";
      serviceConfig = defaultServiceConfig // {
        User = cfg.user;
-        ExecStart = "${pkg}/bin/paperless-ngx qcluster";
+        ExecStart = "${pkg}/bin/celery --app paperless beat --loglevel INFO";
        Restart = "on-failure";
-        # The `mbind` syscall is needed for running the classifier.
-        SystemCallFilter = defaultServiceConfig.SystemCallFilter ++ [ "mbind" ];
-        # Needs to talk to mail server for automated import rules
-        PrivateNetwork = false;
      };
      environment = env;
      wantedBy = [ "multi-user.target" ];
-      wants = [ "paperless-consumer.service" "paperless-web.service" ];
+      wants = [ "paperless-consumer.service" "paperless-web.service" "paperless-task-queue.service" ];

      preStart = ''
        ln -sf ${manage} ${cfg.dataDir}/paperless-manage
@@ -250,6 +246,20 @@ in
      after = [ "redis-paperless.service" ];
    };

+    systemd.services.paperless-task-queue = {
+      description = "Paperless Celery Workers";
+      serviceConfig = defaultServiceConfig // {
+        User = cfg.user;
+        ExecStart = "${pkg}/bin/celery --app paperless worker --loglevel INFO";
+        Restart = "on-failure";
+        # The `mbind` syscall is needed for running the classifier.
+        SystemCallFilter = defaultServiceConfig.SystemCallFilter ++ [ "mbind" ];
+        # Needs to talk to mail server for automated import rules
+        PrivateNetwork = false;
+      };
+      environment = env;
+    };
+
    # Reading the user-provided password file requires root access
    systemd.services.paperless-copy-password = mkIf (cfg.passwordFile != null) {
      requiredBy = [ "paperless-scheduler.service" ];
@@ -301,7 +311,7 @@ in
      };
      # Allow the web interface to access the private /tmp directory of the server.
      # This is required to support uploading files via the web interface.
-      unitConfig.JoinsNamespaceOf = "paperless-scheduler.service";
+      unitConfig.JoinsNamespaceOf = "paperless-task-queue.service";
      # Bind to `paperless-scheduler` so that the web server never runs
      # during migrations
      bindsTo = [ "paperless-scheduler.service" ];
@@ -148,6 +148,16 @@ in {
      visible = false;
    };

+    extraConfig = mkOption {
+      default = "";
+      type = types.lines;
+      example = "DefaultLimitCORE=infinity";
+      description = lib.mdDoc ''
+        Extra config options for systemd. See systemd-system.conf(5) man page
+        for available options.
+      '';
+    };
+
    contents = mkOption {
      description = lib.mdDoc "Set of files that have to be linked into the initrd";
      example = literalExpression ''
@@ -352,6 +362,7 @@ in {
        "/etc/systemd/system.conf".text = ''
          [Manager]
          DefaultEnvironment=PATH=/bin:/sbin ${optionalString (isBool cfg.emergencyAccess && cfg.emergencyAccess) "SYSTEMD_SULOGIN_FORCE=1"}
+          ${cfg.extraConfig}
        '';

        "/lib/modules".source = "${modulesClosure}/lib/modules";
@@ -96,6 +96,12 @@ in
        MaxLevelConsole=debug
      '';

+    boot.initrd.systemd.contents."/etc/systemd/journald.conf".text = ''
+      [Journal]
+      ForwardToConsole=yes
+      MaxLevelConsole=debug
+    '';
+
    systemd.extraConfig = ''
      # Don't clobber the console with duplicate systemd messages.
      ShowStatus=no
@@ -107,6 +113,8 @@ in
      DefaultTimeoutStartSec=300
    '';

+    boot.initrd.systemd.extraConfig = config.systemd.extraConfig;
+
    boot.consoleLogLevel = 7;

    # Prevent tests from accessing the Internet.
@@ -6,7 +6,7 @@
  };
  signal-desktop-beta = {
    dir = "Signal Beta";
-    version = "6.2.0-beta.1";
-    hash = "sha256-OA7DHe/sfW8xpqJPEu7BWotpnaJYj5SatPB21byZHrY=";
+    version = "6.2.0-beta.2";
+    hash = "sha256-NVwX2xG8QGVjENy6fSA13WQyTlYuF5frcS3asDDg4Ik=";
  };
 }
@@ -200,6 +200,9 @@ python.pkgs.pythonPackages.buildPythonApplication rec {
    makeWrapper $out/lib/paperless-ngx/src/manage.py $out/bin/paperless-ngx \
      --prefix PYTHONPATH : "$PYTHONPATH" \
      --prefix PATH : "${path}"
+    makeWrapper ${python.pkgs.celery}/bin/celery $out/bin/celery \
+      --prefix PYTHONPATH : "$PYTHONPATH:$out/lib/paperless-ngx/src" \
+      --prefix PATH : "${path}"
  '';

  checkInputs = with python.pkgs.pythonPackages; [
@@ -1,6 +1,6 @@
 { mkDerivation }:

 mkDerivation {
-  version = "24.3.4.6";
-  sha256 = "sha256-mQbWiHWz4sz4H1cqkhYM8GHe278ylI7VC5zuLBxUsJc=";
+  version = "24.3.4.7";
+  sha256 = "sha256-cOtoSlK3S2irPX8vQ81rPXBH3aWriyoUmidUyaFs11E=";
 }
@@ -41,7 +41,6 @@ rustPlatform.buildRustPackage rec {
    xorg.libX11
    xorg.libXcursor
    xorg.libXi
-    xorg.libXi
    xorg.libXrandr
  ] ++ lib.optionals stdenv.isDarwin [
    darwin.apple_sdk.frameworks.Cocoa
@@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "goreleaser";
-  version = "1.13.1";
+  version = "1.14.0";

  src = fetchFromGitHub {
    owner = "goreleaser";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-KItiCVb1H/XgVZT6f0g/VvvXhhHf6MvMEqQsr62c6d0=";
+    sha256 = "sha256-Vp0oB5DVhYXIk45pDGADEes+OQApE7XFsIk0enSFMqo=";
  };

-  vendorSha256 = "sha256-UpQ2yFprWdwE67MR5voPjgY7wqrtw/ZQbt05Tbo50XY=";
+  vendorSha256 = "sha256-LxQxO5hr+w04UZKqCh4dGteBA08GmXfCtpI8glKajkU=";

  ldflags = [
    "-s"