git-sync: add ssh to path

This fixes automated pushing to repository.
This commit is contained in:
cab 2022-08-22 11:40:41 +04:00 committed by Robert Helgesson
parent f9a35cacdc
commit 66cc5c7ef9
No known key found for this signature in database
GPG Key ID: 36BDAA14C2797E89
3 changed files with 11 additions and 2 deletions

2
.github/CODEOWNERS vendored
View File

@ -345,7 +345,7 @@ Makefile @thiagokokada
/modules/services/fnott.nix @polykernel
/tests/modules/services/fnott @polykernel
/modules/services/git-sync.nix @IvanMalison
/modules/services/git-sync.nix @IvanMalison @cab404
/modules/services/gnome-keyring.nix @rycee

View File

@ -13,6 +13,7 @@ let
Service = {
Environment = [
"PATH=${lib.makeBinPath (with pkgs; [ openssh git ])}"
"GIT_SYNC_DIRECTORY=${repo.path}"
"GIT_SYNC_COMMAND=${cfg.package}/bin/git-sync"
"GIT_SYNC_REPOSITORY=${repo.uri}"
@ -65,7 +66,7 @@ let
});
in {
meta.maintainers = [ maintainers.imalison ];
meta.maintainers = [ maintainers.imalison maintainers.cab404 ];
options = {
services.git-sync = {

View File

@ -11,16 +11,24 @@
};
};
test.stubs = {
git = { name = "git"; };
openssh = { name = "openssh"; };
};
nmt.script = ''
serviceFile=home-files/.config/systemd/user/git-sync-test.service
assertFileExists $serviceFile
serviceFile=$(normalizeStorePaths $serviceFile)
assertFileContent $serviceFile ${
builtins.toFile "expected" ''
[Install]
WantedBy=default.target
[Service]
Environment=PATH=/nix/store/00000000000000000000000000000000-openssh/bin:/nix/store/00000000000000000000000000000000-git/bin
Environment=GIT_SYNC_DIRECTORY=/a/path
Environment=GIT_SYNC_COMMAND=@git-sync@/bin/git-sync
Environment=GIT_SYNC_REPOSITORY=git+ssh://user@example.com:/~user/path/to/repo.git