BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nixos/paperless-ng: minor improvments

Browse source 
Service:
- Fix misleading comment:
  We could in fact implement password copying as a preStart script by
  amending BindReadOnlyPaths, but adding an extra service is simpler.

Test:
- Add more detailed subtest names
- Simplify date check
This commit is contained in:
Erik Arvstedt 2022-04-11 17:06:02 +02:00
parent 99f40c2c13
commit 308c4bf0f7
No known key found for this signature in database
GPG key ID: 33312B944DD97846
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/services/misc/paperless-ng.nix
View file

@ -248,9 +248,7 @@ in
after = [ "redis-paperless-ng.service" ]; after = [ "redis-paperless-ng.service" ];
}; };
# Password copying can't be implemented as a privileged preStart script # Reading the user-provided password file requires root access
# in 'paperless-ng-server' because 'defaultServiceConfig' limits the filesystem
# paths accessible by the service.
systemd.services.paperless-ng-copy-password = mkIf (cfg.passwordFile != null) { systemd.services.paperless-ng-copy-password = mkIf (cfg.passwordFile != null) {
requiredBy = [ "paperless-ng-server.service" ]; requiredBy = [ "paperless-ng-server.service" ];
before = [ "paperless-ng-server.service" ]; before = [ "paperless-ng-server.service" ];

15
nixos/tests/paperless-ng.nix
View file

@ -11,9 +11,11 @@ import ./make-test-python.nix ({ lib, ... }: {
}; };
testScript = '' testScript = ''
import json
machine.wait_for_unit("paperless-ng-consumer.service") machine.wait_for_unit("paperless-ng-consumer.service")
with subtest("Create test doc"): with subtest("Add a document via the file system"):
machine.succeed( machine.succeed(
"convert -size 400x40 xc:white -font 'DejaVu-Sans' -pointsize 20 -fill black " "convert -size 400x40 xc:white -font 'DejaVu-Sans' -pointsize 20 -fill black "
"-annotate +5+20 'hello world 16-10-2005' /var/lib/paperless/consume/doc.png" "-annotate +5+20 'hello world 16-10-2005' /var/lib/paperless/consume/doc.png"
@ -24,7 +26,7 @@ import ./make-test-python.nix ({ lib, ... }: {
# Wait until server accepts connections # Wait until server accepts connections
machine.wait_until_succeeds("curl -fs localhost:28981") machine.wait_until_succeeds("curl -fs localhost:28981")
with subtest("Create web test doc"): with subtest("Add a document via the web interface"):
machine.succeed( machine.succeed(
"convert -size 400x40 xc:white -font 'DejaVu-Sans' -pointsize 20 -fill black " "convert -size 400x40 xc:white -font 'DejaVu-Sans' -pointsize 20 -fill black "
"-annotate +5+20 'hello web 16-10-2005' /tmp/webdoc.png" "-annotate +5+20 'hello web 16-10-2005' /tmp/webdoc.png"
@ -35,11 +37,8 @@ import ./make-test-python.nix ({ lib, ... }: {
machine.wait_until_succeeds( machine.wait_until_succeeds(
"(($(curl -u admin:admin -fs localhost:28981/api/documents/ | jq .count) == 2))" "(($(curl -u admin:admin -fs localhost:28981/api/documents/ | jq .count) == 2))"
) )
assert "2005-10-16" in machine.succeed( docs = json.loads(machine.succeed("curl -u admin:admin -fs localhost:28981/api/documents/"))['results']
"curl -u admin:admin -fs localhost:28981/api/documents/ | jq '.results | .[0] | .created'" assert "2005-10-16" in docs[0]['created']
) assert "2005-10-16" in docs[1]['created']
assert "2005-10-16" in machine.succeed(
"curl -u admin:admin -fs localhost:28981/api/documents/ | jq '.results | .[1] | .created'"
)
''; '';
}) })