From 1d9a210419f358ae01a86b9ba354ab6b72caa359 Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Tue, 23 Jul 2024 00:19:21 -0500
Subject: [PATCH] Seems to start gitlab automatically now

---
 hosts/myself/container-git.nix | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/hosts/myself/container-git.nix b/hosts/myself/container-git.nix
index 2b57a0d..b1644c3 100644
--- a/hosts/myself/container-git.nix
+++ b/hosts/myself/container-git.nix
@@ -177,23 +177,18 @@ in {
 
 	# Do not start nginx until we have tailscaled up and running, so it can bind
 	# to the 100.* addresses
-	systemd.services.nginx = {
-		after = [
-			"tailscaled.service"
-			"network.target"
-			"network-online.target"
-		];
-		wants = [
-			"tailscaled.service"
-			"network.target"
-			"network-online.target"
-		];
-		requires = [
-			"tailscaled.service"
-		];
-		preStart = ''
-			sleep 5  # tailscaled is up before it's ACTUALLY up... try waiting?
-		'';
+	systemd.services = {
+		nginx = rec {
+			after = [
+				"network-online.target"
+			];
+			wants = after;
+			serviceConfig = {
+				RestartMaxDelaySec = "30s";
+				RestartSteps = "5";
+			};
+		};
+		tailscaled.partOf = [ "network-online.target" ];
 	};
 	system.stateVersion = lib.mkForce "24.05";
 }