Unverified Commit 9532793d authored by Casey Link's avatar Casey Link
Browse files

nixos/paperless: refactor to use systemd LoadCredential 

This replaces the paperless-copy-password service with the use of
systemd's LoadCredential mechanism.

It is not a breaking change since it is gated behind `cfg.passwordFile`.
parent 5f8a248a

nixos/modules/services/misc/paperless.nix

+2 −14
Original line number Diff line number Diff line
@@ -238,6 +238,7 @@ in 
        User = cfg.user;

        ExecStart = "${pkg}/bin/celery --app paperless beat --loglevel INFO";

        Restart = "on-failure";

        LoadCredential = lib.optionalString (cfg.passwordFile != null) "PAPERLESS_ADMIN_PASSWORD:${cfg.passwordFile}";

      };

      environment = env;
@@ -270,7 +271,7 @@ in 
      ''

      + optionalString (cfg.passwordFile != null) ''

        export PAPERLESS_ADMIN_USER="''${PAPERLESS_ADMIN_USER:-admin}"

        export PAPERLESS_ADMIN_PASSWORD=$(cat "${cfg.dataDir}/superuser-password")

        export PAPERLESS_ADMIN_PASSWORD=$(cat $CREDENTIALS_DIRECTORY/PAPERLESS_ADMIN_PASSWORD)

        superuserState="$PAPERLESS_ADMIN_USER:$PAPERLESS_ADMIN_PASSWORD"

        superuserStateFile="${cfg.dataDir}/superuser-state"
@@ -298,19 +299,6 @@ in 
      environment = env;

    };



    # Reading the user-provided password file requires root access

    systemd.services.paperless-copy-password = mkIf (cfg.passwordFile != null) {

      requiredBy = [ "paperless-scheduler.service" ];

      before = [ "paperless-scheduler.service" ];

      serviceConfig = {

        ExecStart = ''

          ${pkgs.coreutils}/bin/install --mode 600 --owner '${cfg.user}' --compare \

            '${cfg.passwordFile}' '${cfg.dataDir}/superuser-password'

        '';

        Type = "oneshot";

      };

    };



    systemd.services.paperless-consumer = {

      description = "Paperless document consumer";

      # Bind to `paperless-scheduler` so that the consumer never runs