Unverified Commit e67761b6 authored by Robert Schütz's avatar Robert Schütz Committed by GitHub
Browse files

Merge pull request #292854 from SuperSandro2000/vaultwarden-bitwarden_rs 

vaultwarden: cleanup maintainers, nixos/vaultwarden: drop aliases
parents 8727dcf5 06a63712

nixos/modules/services/security/vaultwarden/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -180,7 +180,6 @@ in { 
    users.groups.vaultwarden = { };



    systemd.services.vaultwarden = {

      aliases = [ "bitwarden_rs.service" ];

      after = [ "network.target" ];

      path = with pkgs; [ openssl ];

      serviceConfig = {
@@ -202,7 +201,6 @@ in { 
    };



    systemd.services.backup-vaultwarden = mkIf (cfg.backupDir != null) {

      aliases = [ "backup-bitwarden_rs.service" ];

      description = "Backup vaultwarden";

      environment = {

        DATA_FOLDER = "/var/lib/bitwarden_rs";
@@ -222,7 +220,6 @@ in { 
    };



    systemd.timers.backup-vaultwarden = mkIf (cfg.backupDir != null) {

      aliases = [ "backup-bitwarden_rs.timer" ];

      description = "Backup vaultwarden on time";

      timerConfig = {

        OnCalendar = mkDefault "23:00";
@@ -240,6 +237,9 @@ in { 
    };

  };



  meta = {

    # uses attributes of the linked package

  meta.buildDocsInSandbox = false;

    buildDocsInSandbox = false;

    maintainers = with lib.maintainers; [ dotlambda SuperSandro2000 ];

  };

}

pkgs/tools/security/vaultwarden/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { 
    homepage = "https://github.com/dani-garcia/vaultwarden";

    changelog = "https://github.com/dani-garcia/vaultwarden/releases/tag/${version}";

    license = licenses.agpl3Only;

    maintainers = with maintainers; [ SuperSandro2000 ivan ];

    maintainers = with maintainers; [ dotlambda SuperSandro2000 ];

    mainProgram = "vaultwarden";

  };

}

pkgs/tools/security/vaultwarden/webvault.nix

+1 −1
Original line number Diff line number Diff line
@@ -69,6 +69,6 @@ in buildNpmPackage rec { 
    changelog = "https://github.com/dani-garcia/bw_web_builds/releases/tag/v${version}";

    platforms = platforms.all;

    license = licenses.gpl3Plus;

    maintainers = with maintainers; [ dotlambda msteen mic92 ];

    inherit (vaultwarden.meta) maintainers;

  };

}