flake: bump inputs

And ensure that the renamed `paperless` services are configured
correctly.
This commit is contained in:
Bruno BELANYI 2022-04-18 14:09:38 +02:00
parent 958cd30b33
commit dd7cb5f081
2 changed files with 17 additions and 17 deletions

View file

@ -44,11 +44,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1649642044, "lastModified": 1650234580,
"narHash": "sha256-V9ZjTJcbDPgWG+H3rIC6XuPHZAPK1VupBbSsuDbptkQ=", "narHash": "sha256-wTmlRedCrDl+XYJom65GMfI3RgA3eZE/w03lD28Txoc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e39a9d0103e3b2e42059c986a8c633824b96c193", "rev": "742c6cb3e9d866e095c629162fe5faf519adeb26",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -60,11 +60,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1649497218, "lastModified": 1650161686,
"narHash": "sha256-groqC9m1P4hpnL6jQvZ3C8NEtduhdkvwGT0+0LUrcYw=", "narHash": "sha256-70ZWAlOQ9nAZ08OU6WY7n4Ij2kOO199dLfNlvO/+pf8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fd364d268852561223a5ada15caad669fd72800e", "rev": "1ffba9f2f683063c2b14c9f4d12c55ad5f4ed887",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -76,11 +76,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1649676035, "lastModified": 1650270687,
"narHash": "sha256-GjUAElCJqjZorW2U4q+hSIc/HYw3rKzn68mlyo5+53s=", "narHash": "sha256-It/SRKKhqjoRzXd40ThUxitZX3e4WD02rb2mlQ7Wc9I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "08069280d424b529b58a48d40fb86b616cae6da4", "rev": "43c55bab29a7d002e33cad7148a482f56b6b90b6",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -45,7 +45,7 @@ in
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
services.paperless-ng = { services.paperless = {
enable = true; enable = true;
port = cfg.port; port = cfg.port;
@ -83,15 +83,15 @@ in
}; };
systemd.services = { systemd.services = {
paperless-ng-server.serviceConfig = { paperless-scheduler.serviceConfig = {
EnvironmentFile = cfg.secretKeyFile; EnvironmentFile = cfg.secretKeyFile;
}; };
paperless-ng-consumer.serviceConfig = { paperless-consumer.serviceConfig = {
EnvironmentFile = cfg.secretKeyFile; EnvironmentFile = cfg.secretKeyFile;
}; };
paperless-ng-web.serviceConfig = { paperless-web.serviceConfig = {
EnvironmentFile = cfg.secretKeyFile; EnvironmentFile = cfg.secretKeyFile;
}; };
}; };
@ -111,13 +111,13 @@ in
# Set-up media group # Set-up media group
users.groups.media = { }; users.groups.media = { };
systemd.services.paperless-ng-server = { systemd.services.paperless-server = {
# Make sure the DB is available # Make sure the DB is available
after = [ "postgresql.service" ]; after = [ "postgresql.service" ];
}; };
users.users.${config.services.paperless-ng.user} = { users.users.${config.services.paperless.user} = {
extraGroups = [ "media" ]; extraGroups = [ "media" ];
}; };
@ -138,8 +138,8 @@ in
my.services.backup = { my.services.backup = {
paths = [ paths = [
config.services.paperless-ng.dataDir config.services.paperless.dataDir
config.services.paperless-ng.mediaDir config.services.paperless.mediaDir
]; ];
}; };
}; };