CCCHH/nix-infra
CCCHH/nix-infra
2
3
Fork 2
Code Issues1 Pull requests1 Wiki Activity

finally fix pulling and refreshing the config in a stable way

Browse source
This commit is contained in:
echtnurich 2025-01-24 19:12:46 +01:00
parent d413dc071e
commit a2e67f746f
Signed by: echtnurich
SSH key fingerprint: SHA256:1eIkxME0VPeXC2WMl9Haus+q0SLFymSAWU7f6Z+A8Aw
1 changed files with 6 additions and 4 deletions

10
config/hosts/yate/yate.nix
View file

@ -56,20 +56,22 @@
requires = [ "network-online.target" ]; requires = [ "network-online.target" ];
preStart = '' preStart = ''
echo \"\n\" >> /run/secrets/git_clone_key echo \"\n\" >> /run/secrets/git_clone_key
id
sleep 5 sleep 5
SSH_SUCCESS=1 SSH_SUCCESS=1
${pkgs.openssh}/bin/ssh -q -i /run/secrets/git_clone_key forgejo@git.hamburg.ccc.de 2> /var/lib/yate/SSH_CHECK_LOG || SSH_SUCCESS=0 ${pkgs.openssh}/bin/ssh -q -i /run/secrets/git_clone_key forgejo@git.hamburg.ccc.de 2> /var/lib/yate/SSH_CHECK_LOG || SSH_SUCCESS=0
if [ $SSH_SUCCESS = 1 ]; then if [ $SSH_SUCCESS = 1 ]; then
rm -rf /var/lib/yate/* rm -rf /var/lib/yate/*
rm -rf /var/lib/yate/.* rm -rf /var/lib/yate/.*
env GIT_SSH_COMMAND=\"${pkgs.openssh}/bin/ssh -i /run/secrets/git_clone_key\" ${pkgs.git}/bin/git clone forgejo@git.hamburg.ccc.de:CCCHH/yate-config.git /var/lib/yate env GIT_SSH_COMMAND="${pkgs.openssh}/bin/ssh -i /run/secrets/git_clone_key" ${pkgs.git}/bin/git clone forgejo@git.hamburg.ccc.de:CCCHH/yate-config.git /var/lib/yate
${pkgs.git}/bin/git -C /var/lib/yate config --add safe.directory \"/var/lib/yate\" ${pkgs.git}/bin/git -C /var/lib/yate config --add safe.directory "/var/lib/yate"
fi fi
''; '';
reload= '' reload= ''
id
${pkgs.git}/bin/git config --global --add safe.directory /var/lib/yate ${pkgs.git}/bin/git config --global --add safe.directory /var/lib/yate
/usr/bin/env GIT_SSH_COMMAND=\\"${pkgs.openssh}/bin/ssh -i /run/secrets/git_clone_key\\" ${pkgs.git}/bin/git -C /var/lib/yate fetch --all /usr/bin/env GIT_SSH_COMMAND="${pkgs.openssh}/bin/ssh -i /run/secrets/git_clone_key" ${pkgs.git}/bin/git -C /var/lib/yate fetch --all
/usr/bin/env GIT_SSH_COMMAND=\\"${pkgs.openssh}/bin/ssh -i /run/secrets/git_clone_key\\" ${pkgs.git}/bin/git -C /var/lib/yate reset --hard origin/main /usr/bin/env GIT_SSH_COMMAND="${pkgs.openssh}/bin/ssh -i /run/secrets/git_clone_key" ${pkgs.git}/bin/git -C /var/lib/yate reset --hard origin/master
''; '';
}; };
} }