diff options
| author | Zane van Iperen <zane@zanevaniperen.com> | 2021-07-11 12:48:10 +1000 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-08-02 07:18:32 +0000 |
| commit | f1808e78107f1aada1d0f3fb3940736cd513e373 (patch) | |
| tree | 2e9d79b6513bf3e8080c4a57bcc3e88833f6a240 | |
| parent | Merge pull request #127576 from NixOS/backport-127435-to-release-21.05 (diff) | |
| download | nixpkgs-origin/backport-129861-to-release-21.05.tar.gz | |
nixos/gitea: use gitea to refresh hooks and keysorigin/backport-129861-to-release-21.05
Gitea now provides this functionality as an admin command.
Is significantly faster, especially on slow disks.
(cherry picked from commit c854b8570285ac4c14282a5efa0f8334a520ac8d)
| -rw-r--r-- | nixos/modules/services/misc/gitea.nix | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index 95369ff7ee48..84fa9bfb6b5f 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -523,19 +523,12 @@ in ''} # update all hooks' binary paths - HOOKS=$(find ${cfg.repositoryRoot} -mindepth 4 -maxdepth 6 -type f -wholename "*git/hooks/*") - if [ "$HOOKS" ] - then - sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${gitea}/bin/gitea,g' $HOOKS - sed -ri 's,/nix/store/[a-z0-9.-]+/bin/env,${pkgs.coreutils}/bin/env,g' $HOOKS - sed -ri 's,/nix/store/[a-z0-9.-]+/bin/bash,${pkgs.bash}/bin/bash,g' $HOOKS - sed -ri 's,/nix/store/[a-z0-9.-]+/bin/perl,${pkgs.perl}/bin/perl,g' $HOOKS - fi + ${gitea}/bin/gitea admin regenerate hooks # update command option in authorized_keys if [ -r ${cfg.stateDir}/.ssh/authorized_keys ] then - sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${gitea}/bin/gitea,g' ${cfg.stateDir}/.ssh/authorized_keys + ${gitea}/bin/gitea admin regenerate keys fi ''; |