From 3b83a5d8ab77967a0d5ab0f1a8abb853f25fd4dd Mon Sep 17 00:00:00 2001 From: echtnurich Date: Wed, 7 Aug 2024 18:51:12 +0200 Subject: [PATCH] recreate the full config everytime --- config/hosts/yate/service.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/config/hosts/yate/service.nix b/config/hosts/yate/service.nix index bdaed23..7d74449 100644 --- a/config/hosts/yate/service.nix +++ b/config/hosts/yate/service.nix @@ -34,18 +34,14 @@ wantedBy = [ "default.target" ]; requiredBy = [ "network.target" ]; preStart = "echo \"\n\" >> /run/secrets/git_clone_key - if ! [ -d \"/var/lib/yate/.git\" ] - then + rm -rf /var/lib/yate/* + rm -rf /var/lib/yate/.* ${pkgs.git}/bin/git init /var/lib/yate - ${pkgs.git}/bin/git -C /var/lib/yate remote add origin forgejo@git.hamburg.ccc.de:echtnurich/yate-config.git - env GIT_SSH_COMMAND=\"${pkgs.openssh}/bin/ssh -i /run/secrets/git_clone_key\" ${pkgs.git}/bin/git -C /var/lib/yate pull -f --set-upstream - ${pkgs.git}/bin/git -C /var/lib/yate checkout --track -f origin/master - echo \"New repo set up.\" - fi - test ${pkgs.openssh}/bin/ssh ${pkgs.git}/bin/git -C /var/lib/yate config --add safe.directory \"/var/lib/yate\" + ${pkgs.git}/bin/git -C /var/lib/yate remote add origin forgejo@git.hamburg.ccc.de:echtnurich/yate-config.git env GIT_SSH_COMMAND=\"${pkgs.openssh}/bin/ssh -i /run/secrets/git_clone_key\" ${pkgs.git}/bin/git -C /var/lib/yate fetch --all - ${pkgs.git}/bin/git -C /var/lib/yate checkout -f origin/master"; + ${pkgs.git}/bin/git -C /var/lib/yate checkout --track -f origin/master"; + # ... }; }