From e24b5b6fb111d3dc3db8bd3539fcbd1389314928 Mon Sep 17 00:00:00 2001
From: echtnurich <ich@echtnurich.de>
Date: Sun, 8 Sep 2024 21:08:17 +0200
Subject: [PATCH] fix yate-config not pulling

---
 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 f959f65..9013060 100644
--- a/config/hosts/yate/service.nix
+++ b/config/hosts/yate/service.nix
@@ -18,8 +18,7 @@
     enable = true;
     description = "Yate telehony engine";
     unitConfig = {
-      Type = "simple";
-      After= "network.target";
+      After= "network-online.target";
     };
     serviceConfig = {
       ExecStart = "${pkgs.yate}/bin/yate -c /etc/yate -e /etc/yate/share";
@@ -32,19 +31,16 @@
       # ...
     };
     wantedBy = [ "default.target" ];
-    requiredBy = [ "network.target" ]; 
+    requires = [ "network-online.target" ]; 
     preStart = "echo \"\n\" >> /run/secrets/git_clone_key
-                sleep 1
+                sleep 5
                 SSH_SUCCESS=1
-                ${pkgs.openssh}/bin/ssh -q -i /run/secrets/git_clone_key forgejo@git.hamburg.ccc.de || 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
                 rm -rf /var/lib/yate/*
                 rm -rf /var/lib/yate/.*
-                ${pkgs.git}/bin/git init /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 remote add origin forgejo@git.hamburg.ccc.de:CCCHH/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 --track -f origin/master
                 fi";
 
     # ...