From 9038f3998dcc66f2ca091100f857a518fe201212 Mon Sep 17 00:00:00 2001
From: Franck Cuny <franck@fcuny.net>
Date: Sat, 5 Nov 2022 13:26:49 -0700
Subject: fix(services/drone): enable drone

The URL for drone changed to https://ci.fcuny.net. The secrets also
changed (and we remove the unencrypted file with secrets).
---
 modules/services/drone/runner-exec/default.nix | 7 +++++--
 modules/services/drone/server/default.nix      | 7 +------
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'modules')

diff --git a/modules/services/drone/runner-exec/default.nix b/modules/services/drone/runner-exec/default.nix
index 01cc11b..cbfbb9d 100644
--- a/modules/services/drone/runner-exec/default.nix
+++ b/modules/services/drone/runner-exec/default.nix
@@ -19,10 +19,12 @@ in
           "DRONE_SERVER_PROTO=https"
           "DRONE_RUNNER_CAPACITY=10"
           "CLIENT_DRONE_RPC_HOST=127.0.0.1:${toString cfg.port}"
-          "NIX_REMOTE=daemon"
           "PAGER=cat"
         ];
-        BindPaths = [ "/nix/var/nix/daemon-socket/socket" ];
+        BindPaths = [
+          "/nix/var/nix/daemon-socket/socket"
+          "/var/run/docker.sock"
+        ];
         BindReadOnlyPaths = [
           "/etc/resolv.conf:/etc/resolv.conf"
           "/etc/resolvconf.conf:/etc/resolvconf.conf"
@@ -49,6 +51,7 @@ in
     users.users.drone-runner-exec = {
       isSystemUser = true;
       group = "drone-runner-exec";
+      extraGroups = [ "docker" ]; # Give access to the daemon
     };
     users.groups.drone-runner-exec = { };
   };
diff --git a/modules/services/drone/server/default.nix b/modules/services/drone/server/default.nix
index 97e20a3..77f4ee2 100644
--- a/modules/services/drone/server/default.nix
+++ b/modules/services/drone/server/default.nix
@@ -36,18 +36,13 @@ in
 
     services.nginx.virtualHosts."${cfg.vhostName}" = {
       forceSSL = true;
-      useACMEHost = cfg.vhostName;
+      enableACME = true;
       locations."/" = {
         proxyPass = "http://127.0.0.1:${toString cfg.port}";
         proxyWebsockets = true;
       };
     };
 
-    security.acme.certs."${cfg.vhostName}" = {
-      dnsProvider = "gcloud";
-      credentialsFile = secrets."acme/credentials".path;
-    };
-
     my.services.backup = { paths = [ "/var/lib/droner-server" ]; };
   };
 }
-- 
cgit 1.4.1