colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #292854 from SuperSandro2000/vaultwarden-bitwarden_rs

Browse Source 
vaultwarden: cleanup maintainers, nixos/vaultwarden: drop aliases
This commit is contained in:
Robert Schütz 2024-03-04 00:36:06 +00:00 committed by GitHub
commit e67761b6f6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/services/security/vaultwarden/default.nix
View File

@ -180,7 +180,6 @@ in {
users.groups.vaultwarden = { }; users.groups.vaultwarden = { };
systemd.services.vaultwarden = { systemd.services.vaultwarden = {
aliases = [ "bitwarden_rs.service" ];
after = [ "network.target" ]; after = [ "network.target" ];
path = with pkgs; [ openssl ]; path = with pkgs; [ openssl ];
serviceConfig = { serviceConfig = {
@ -202,7 +201,6 @@ in {
}; };
systemd.services.backup-vaultwarden = mkIf (cfg.backupDir != null) { systemd.services.backup-vaultwarden = mkIf (cfg.backupDir != null) {
aliases = [ "backup-bitwarden_rs.service" ];
description = "Backup vaultwarden"; description = "Backup vaultwarden";
environment = { environment = {
DATA_FOLDER = "/var/lib/bitwarden_rs"; DATA_FOLDER = "/var/lib/bitwarden_rs";
@ -222,7 +220,6 @@ in {
}; };
systemd.timers.backup-vaultwarden = mkIf (cfg.backupDir != null) { systemd.timers.backup-vaultwarden = mkIf (cfg.backupDir != null) {
aliases = [ "backup-bitwarden_rs.timer" ];
description = "Backup vaultwarden on time"; description = "Backup vaultwarden on time";
timerConfig = { timerConfig = {
OnCalendar = mkDefault "23:00"; OnCalendar = mkDefault "23:00";
@ -240,6 +237,9 @@ in {
}; };
}; };
# uses attributes of the linked package meta = {
meta.buildDocsInSandbox = false; # uses attributes of the linked package
buildDocsInSandbox = false;
maintainers = with lib.maintainers; [ dotlambda SuperSandro2000 ];
};
} }

2
pkgs/tools/security/vaultwarden/default.nix
View File

@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/dani-garcia/vaultwarden"; homepage = "https://github.com/dani-garcia/vaultwarden";
changelog = "https://github.com/dani-garcia/vaultwarden/releases/tag/${version}"; changelog = "https://github.com/dani-garcia/vaultwarden/releases/tag/${version}";
license = licenses.agpl3Only; license = licenses.agpl3Only;
maintainers = with maintainers; [ SuperSandro2000 ivan ]; maintainers = with maintainers; [ dotlambda SuperSandro2000 ];
mainProgram = "vaultwarden"; mainProgram = "vaultwarden";
}; };
} }

2
pkgs/tools/security/vaultwarden/webvault.nix
View File

@ -69,6 +69,6 @@ in buildNpmPackage rec {
changelog = "https://github.com/dani-garcia/bw_web_builds/releases/tag/v${version}"; changelog = "https://github.com/dani-garcia/bw_web_builds/releases/tag/v${version}";
platforms = platforms.all; platforms = platforms.all;
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ dotlambda msteen mic92 ]; inherit (vaultwarden.meta) maintainers;
}; };
} }