From d8f608db5403c368d44d45ccd58e0c47525046a3 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Sat, 25 Feb 2023 17:53:47 +0100
Subject: [PATCH] drone: ensure docker starts before trying to

create docker network drone-net with systemd dependencies
---
 hosts/flora-6/drone.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/hosts/flora-6/drone.nix b/hosts/flora-6/drone.nix
index 8b7dd693..99655bc3 100644
--- a/hosts/flora-6/drone.nix
+++ b/hosts/flora-6/drone.nix
@@ -31,12 +31,16 @@
     "d '/var/lib/drone-db' 0750 drone drone - -"
   ];
 
-  system.activationScripts.mkDroneNet = let
+  systemd.services."docker-network-drone" = let
     docker = config.virtualisation.oci-containers.backend;
     dockerBin = "${pkgs.${docker}}/bin/${docker}";
-  in ''
-    ${dockerBin} network inspect drone-net >/dev/null 2>&1 || ${dockerBin} network create drone-net --subnet 172.20.0.0/24
-  '';
+  in {
+    serviceConfig.Type = "oneshot";
+    before = ["docker-drone-server"];
+    script = ''
+      ${dockerBin} network inspect drone-net >/dev/null 2>&1 || ${dockerBin} network create drone-net --subnet 172.20.0.0/24
+    '';
+  };
 
   virtualisation = {
     docker = {