drone.server: modularise

hosts/vm.strangervm.ts.hillion.co.uk/default.nix

@@ -3,7 +3,6 @@
 {
   imports = [
     ../../modules/common/default.nix
-    ../../modules/drone/server.nix
     ./hardware-configuration.nix
   ];
 
@@ -21,6 +20,7 @@
     ## Custom Services
     custom = {
       locations.autoServe = true;
+      drone.server.path = "/data/drone";
     };
 
     ## Networking

modules/default.nix

@@ -6,6 +6,7 @@
     ./chia.nix
     ./common/hostinfo.nix
     ./desktop/awesome/default.nix
+    ./drone/default.nix
     ./impermanence.nix
     ./locations.nix
     ./resilio.nix

modules/drone/default.nix

@@ -0,0 +1,7 @@
+{ ... }:
+
+{
+  imports = [
+    ./server.nix
+  ];
+}

modules/drone/server.nix

@@ -1,25 +1,43 @@
 { config, pkgs, lib, ... }:
 
+let
+  cfg = config.custom.drone.server;
+in
 {
-  config.age.secrets."drone/gitea_client_secret".file = ../../secrets/drone/gitea_client_secret.age;
-  config.age.secrets."drone/rpc_secret".file = ../../secrets/drone/rpc_secret.age;
+  options.custom.drone.server = {
+    enable = lib.mkEnableOption "drone server";
 
-  config.virtualisation.oci-containers.containers."drone" = {
-    image = "drone/drone:2.16.0";
-    volumes = [ "/data/drone:/data" ];
-    ports = [ "18733:80" ];
-    environment = {
-      DRONE_AGENTS_ENABLED = "true";
-      DRONE_GITEA_SERVER = "https://gitea.hillion.co.uk";
-      DRONE_GITEA_CLIENT_ID = "687ee331-ad9e-44fd-9e02-7f1c652754bb";
-      DRONE_SERVER_HOST = "drone.hillion.co.uk";
-      DRONE_SERVER_PROTO = "https";
-      DRONE_LOGS_DEBUG = "true";
-      DRONE_USER_CREATE = "username:JakeHillion,admin:true";
+    path = lib.mkOption {
+      type = lib.types.str;
+      default = "/var/lib/drone";
+    };
+    port = lib.mkOption {
+      type = lib.types.port;
+      default = 18733;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    age.secrets."drone/gitea_client_secret".file = ../../secrets/drone/gitea_client_secret.age;
+    age.secrets."drone/rpc_secret".file = ../../secrets/drone/rpc_secret.age;
+
+    virtualisation.oci-containers.containers."drone" = {
+      image = "drone/drone:2.21.0";
+      volumes = [ "${cfg.path}:/data" ];
+      ports = [ "${toString cfg.port}:80" ];
+      environment = {
+        DRONE_AGENTS_ENABLED = "true";
+        DRONE_GITEA_SERVER = "https://gitea.hillion.co.uk";
+        DRONE_GITEA_CLIENT_ID = "687ee331-ad9e-44fd-9e02-7f1c652754bb";
+        DRONE_SERVER_HOST = "drone.hillion.co.uk";
+        DRONE_SERVER_PROTO = "https";
+        DRONE_LOGS_DEBUG = "true";
+        DRONE_USER_CREATE = "username:JakeHillion,admin:true";
+      };
+      environmentFiles = [
+        config.age.secrets."drone/gitea_client_secret".path
+        config.age.secrets."drone/rpc_secret".path
+      ];
     };
-    environmentFiles = [
-      config.age.secrets."drone/gitea_client_secret".path
-      config.age.secrets."drone/rpc_secret".path
-    ];
   };
 }

modules/locations.nix

@@ -17,6 +17,9 @@ in
           mastodon = "vm.strangervm.ts.hillion.co.uk";
           matrix = "jorah.cx.ts.hillion.co.uk";
         };
+        drone = {
+          server = "vm.strangervm.ts.hillion.co.uk";
+        };
       };
     };
   };
@@ -25,5 +28,7 @@ in
     custom.services.downloads.enable = cfg.locations.services.downloads == config.networking.fqdn;
     custom.services.mastodon.enable = cfg.locations.services.mastodon == config.networking.fqdn;
     custom.services.matrix.enable = cfg.locations.services.matrix == config.networking.fqdn;
+
+    custom.drone.server.enable = cfg.locations.drone.server == config.networking.fqdn;
   };
 }

modules/www/global.nix

@@ -51,7 +51,7 @@ in
           reverse_proxy /_synapse/client/* http://${locations.services.matrix}:8008
         '';
         "drone.hillion.co.uk".extraConfig = ''
-          reverse_proxy http://vm.strangervm.ts.hillion.co.uk:18733
+          reverse_proxy http://${locations.drone.server}:18733
         '';
       };
     };