From 19e25f58566866b7c5182ab0d26ff66cba2eeffd Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 7 Jul 2019 21:18:32 +0200
Subject: shack/gitlab-ci: enable graceful shutdown

---
 krebs/2configs/shack/gitlab-runner.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'krebs/2configs/shack/gitlab-runner.nix')

diff --git a/krebs/2configs/shack/gitlab-runner.nix b/krebs/2configs/shack/gitlab-runner.nix
index 0fd06426..f1bb94f3 100644
--- a/krebs/2configs/shack/gitlab-runner.nix
+++ b/krebs/2configs/shack/gitlab-runner.nix
@@ -13,9 +13,12 @@ in
   imports = [
     "${runner-src}/gitlab-runner.nix"
   ];
-  services.gitlab-runner2.enable = true;
-  ## registrationConfigurationFile contains:
-  # CI_SERVER_URL=<CI server URL>
-  # REGISTRATION_TOKEN=<registration secret>
-  services.gitlab-runner2.registrationConfigFile = <secrets/shackspace-gitlab-ci>;
+  services.gitlab-runner2 = {
+    enable = true;
+    ## registrationConfigurationFile contains:
+    # CI_SERVER_URL=<CI server URL>
+    # REGISTRATION_TOKEN=<registration secret>
+    registrationConfigFile = <secrets/shackspace-gitlab-ci>;
+    gracefulTermination = true;
+  };
 }
-- 
cgit v1.2.3


From 7ca133e90b565e0cd97fe447b3bd4872d11a22a8 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 8 Jul 2019 00:58:38 +0200
Subject: shack/gitlab-runner: do not restart service on change

---
 krebs/2configs/shack/gitlab-runner.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'krebs/2configs/shack/gitlab-runner.nix')

diff --git a/krebs/2configs/shack/gitlab-runner.nix b/krebs/2configs/shack/gitlab-runner.nix
index f1bb94f3..501dc47e 100644
--- a/krebs/2configs/shack/gitlab-runner.nix
+++ b/krebs/2configs/shack/gitlab-runner.nix
@@ -19,6 +19,7 @@ in
     # CI_SERVER_URL=<CI server URL>
     # REGISTRATION_TOKEN=<registration secret>
     registrationConfigFile = <secrets/shackspace-gitlab-ci>;
-    gracefulTermination = true;
+    #gracefulTermination = true;
   };
+  systemd.services.gitlab-runner2.restartIfChanged = false;
 }
-- 
cgit v1.2.3


From 9f27ddabacb1f163751d5ce45de0b972bb22aab3 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 11 Jul 2019 09:37:23 +0200
Subject: shack/gitlab-runner: docker.restartIfChanged = false

---
 krebs/2configs/shack/gitlab-runner.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'krebs/2configs/shack/gitlab-runner.nix')

diff --git a/krebs/2configs/shack/gitlab-runner.nix b/krebs/2configs/shack/gitlab-runner.nix
index 501dc47e..5f2ca02d 100644
--- a/krebs/2configs/shack/gitlab-runner.nix
+++ b/krebs/2configs/shack/gitlab-runner.nix
@@ -6,10 +6,6 @@ let
   };
 in
 {
-  systemd.services.gitlab-runner.path = [
-    "/run/wrappers" # /run/wrappers/bin/su
-    "/" # /bin/sh
-  ];
   imports = [
     "${runner-src}/gitlab-runner.nix"
   ];
@@ -22,4 +18,5 @@ in
     #gracefulTermination = true;
   };
   systemd.services.gitlab-runner2.restartIfChanged = false;
+  systemd.services.docker.restartIfChanged = false;
 }
-- 
cgit v1.2.3