diff options
| author | Aaron Andersen <aaron@fosslib.net> | 2021-08-01 15:57:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-01 15:57:11 -0400 |
| commit | 7841f5f4eb20dcd42c2a9bbd43af4bcbc7451ce5 (patch) | |
| tree | b85f1e12d1e903f375ba5291b15c9f917c2af9ca /nixos/modules | |
| parent | 863a26e3809df2ecffc63c45831c82b33b05317e (diff) | |
| parent | c854b8570285ac4c14282a5efa0f8334a520ac8d (diff) | |
| download | nixpkgs-7841f5f4eb20dcd42c2a9bbd43af4bcbc7451ce5.tar nixpkgs-7841f5f4eb20dcd42c2a9bbd43af4bcbc7451ce5.tar.gz nixpkgs-7841f5f4eb20dcd42c2a9bbd43af4bcbc7451ce5.tar.bz2 nixpkgs-7841f5f4eb20dcd42c2a9bbd43af4bcbc7451ce5.tar.lz nixpkgs-7841f5f4eb20dcd42c2a9bbd43af4bcbc7451ce5.tar.xz nixpkgs-7841f5f4eb20dcd42c2a9bbd43af4bcbc7451ce5.tar.zst nixpkgs-7841f5f4eb20dcd42c2a9bbd43af4bcbc7451ce5.zip | |
Merge pull request #129861 from vs49688/giteafix
modules/gitea: use gitea to refresh hooks and keys
Diffstat (limited to 'nixos/modules')
| -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 b6c1ca3e61a..2f8e595cad0 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 ''; |