about summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--home/default.nix1
-rw-r--r--home/drone-cli/default.nix12
-rw-r--r--hosts/tahoe/secrets/drone/secrets.agebin697 -> 0 bytes
-rw-r--r--hosts/tahoe/secrets/drone/shared-secrets5
-rw-r--r--modules/services/default.nix1
-rw-r--r--modules/services/drone/default.nix39
-rw-r--r--modules/services/drone/runner-docker/default.nix40
-rw-r--r--modules/services/drone/runner-exec/default.nix55
-rw-r--r--modules/services/drone/server/default.nix53
-rw-r--r--tools/dnsupdate/main.go1
10 files changed, 0 insertions, 207 deletions
diff --git a/home/default.nix b/home/default.nix
index 485cc34..0c7d664 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -6,7 +6,6 @@
     ./bluetooth
     ./direnv
     ./documentation
-    ./drone-cli
     ./element
     ./emacs
     ./eog
diff --git a/home/drone-cli/default.nix b/home/drone-cli/default.nix
deleted file mode 100644
index 948e88a..0000000
--- a/home/drone-cli/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }:
-let cfg = config.my.home.drone-cli;
-in
-{
-  options.my.home.drone-cli = with lib; {
-    enable = mkEnableOption "drone-cli configuration";
-  };
-  config = lib.mkIf cfg.enable {
-    home.packages = with pkgs; [ drone-cli ];
-    home.sessionVariables = { DRONE_SERVER = "https://drone.fcuny.xyz/"; };
-  };
-}
diff --git a/hosts/tahoe/secrets/drone/secrets.age b/hosts/tahoe/secrets/drone/secrets.age
deleted file mode 100644
index 618bbc6..0000000
--- a/hosts/tahoe/secrets/drone/secrets.age
+++ /dev/null
Binary files differdiff --git a/hosts/tahoe/secrets/drone/shared-secrets b/hosts/tahoe/secrets/drone/shared-secrets
deleted file mode 100644
index 47612be..0000000
--- a/hosts/tahoe/secrets/drone/shared-secrets
+++ /dev/null
@@ -1,5 +0,0 @@
-DRONE_GITEA_CLIENT_ID=21ef7412-a58a-493c-beec-2e1dc27ebe79
-DRONE_GITEA_CLIENT_SECRET=GCXGi97PXxAoMTpHveMtNJXDyzdvI8jeC0TaEtCgpPab
-DRONE_GITEA_SERVER=https://git.fcuny.net
-DRONE_GIT_ALWAYS_AUTH=1
-DRONE_RPC_SECRET=d3daa6782d0f4ed66f7f557fa384ff8f
diff --git a/modules/services/default.nix b/modules/services/default.nix
index 5898b05..9351490 100644
--- a/modules/services/default.nix
+++ b/modules/services/default.nix
@@ -6,7 +6,6 @@
     ./backup
     ./buildkite
     ./cgit
-    ./drone
     ./fwupd
     ./gerrit
     ./gnome
diff --git a/modules/services/drone/default.nix b/modules/services/drone/default.nix
deleted file mode 100644
index dedf120..0000000
--- a/modules/services/drone/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-# A docker-based CI/CD system
-#
-# Inspired by [1]
-# [1]: https://github.com/Mic92/dotfiles/blob/master/nixos/eve/modules/drone.nix
-{ lib, ... }: {
-  imports = [ ./runner-docker ./runner-exec ./server ];
-
-  options.my.services.drone = with lib; {
-    enable = mkEnableOption "Drone CI";
-    vhostName = mkOption {
-      type = types.str;
-      example = "drone.fcuny.net";
-      description = "Name for the virtual host";
-    };
-    runners = mkOption {
-      type = with types; listOf (enum [ "exec" "docker" ]);
-      default = [ ];
-      example = [ "exec" "docker" ];
-      description = "Types of runners to enable";
-    };
-    admin = mkOption {
-      type = types.str;
-      default = "fcuny";
-      example = "admin";
-      description = "Name of the admin user";
-    };
-    port = mkOption {
-      type = types.port;
-      default = 3030;
-      example = 8080;
-      description = "Internal port of the Drone UI";
-    };
-    sharedSecretFile = mkOption {
-      type = types.str;
-      example = "/run/secrets/drone-rpc.env";
-      description = "Shared RPC secret to inject into server and runners";
-    };
-  };
-}
diff --git a/modules/services/drone/runner-docker/default.nix b/modules/services/drone/runner-docker/default.nix
deleted file mode 100644
index 428a8d6..0000000
--- a/modules/services/drone/runner-docker/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  cfg = config.my.services.drone;
-  hasRunner = (name: builtins.elem name cfg.runners);
-  dockerPkg = pkgs.drone-runner-docker;
-in
-{
-  config = lib.mkIf (cfg.enable && hasRunner "docker") {
-    systemd.services.drone-runner-docker = {
-      wantedBy = [ "multi-user.target" ];
-      after = [ "docker.socket" ]; # Needs the socket to be available
-      # might break deployment
-      restartIfChanged = false;
-      confinement.enable = true;
-      serviceConfig = {
-        Environment = [
-          "DRONE_SERVER_HOST=${cfg.vhostName}"
-          "DRONE_SERVER_PROTO=https"
-          "DRONE_RUNNER_CAPACITY=10"
-          "CLIENT_DRONE_RPC_HOST=127.0.0.1:${toString cfg.port}"
-        ];
-        BindPaths = [ "/var/run/docker.sock" ];
-        EnvironmentFile = [ cfg.sharedSecretFile ];
-        ExecStart = "${dockerPkg}/bin/drone-runner-docker";
-        User = "drone-runner-docker";
-        Group = "drone-runner-docker";
-      };
-    };
-
-    # Make sure it is activated in that case
-    virtualisation.docker.enable = true;
-
-    users.users.drone-runner-docker = {
-      isSystemUser = true;
-      group = "drone-runner-docker";
-      extraGroups = [ "docker" ]; # Give access to the daemon
-    };
-    users.groups.drone-runner-docker = { };
-  };
-}
diff --git a/modules/services/drone/runner-exec/default.nix b/modules/services/drone/runner-exec/default.nix
deleted file mode 100644
index 01cc11b..0000000
--- a/modules/services/drone/runner-exec/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  cfg = config.my.services.drone;
-  hasRunner = (name: builtins.elem name cfg.runners);
-  execPkg = pkgs.drone-runner-exec;
-in
-{
-  config = lib.mkIf (cfg.enable && hasRunner "exec") {
-    systemd.services.drone-runner-exec = {
-      wantedBy = [ "multi-user.target" ];
-      # might break deployment
-      restartIfChanged = false;
-      confinement.enable = true;
-      confinement.packages = with pkgs; [ git gnutar bash nixUnstable gzip ];
-      path = with pkgs; [ git gnutar bash nixUnstable gzip ];
-      serviceConfig = {
-        Environment = [
-          "DRONE_SERVER_HOST=${cfg.vhostName}"
-          "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" ];
-        BindReadOnlyPaths = [
-          "/etc/resolv.conf:/etc/resolv.conf"
-          "/etc/resolvconf.conf:/etc/resolvconf.conf"
-          "/etc/passwd:/etc/passwd"
-          "/etc/group:/etc/group"
-          "/nix/var/nix/profiles/system/etc/nix:/etc/nix"
-          "${
-            config.environment.etc."ssl/certs/ca-certificates.crt".source
-          }:/etc/ssl/certs/ca-certificates.crt"
-          "${
-            config.environment.etc."ssh/ssh_known_hosts".source
-          }:/etc/ssh/ssh_known_hosts"
-          "/etc/machine-id"
-          # channels are dynamic paths in the nix store, therefore we need to bind mount the whole thing
-          "/nix/"
-        ];
-        EnvironmentFile = [ cfg.sharedSecretFile ];
-        ExecStart = "${execPkg}/bin/drone-runner-exec";
-        User = "drone-runner-exec";
-        Group = "drone-runner-exec";
-      };
-    };
-
-    users.users.drone-runner-exec = {
-      isSystemUser = true;
-      group = "drone-runner-exec";
-    };
-    users.groups.drone-runner-exec = { };
-  };
-}
diff --git a/modules/services/drone/server/default.nix b/modules/services/drone/server/default.nix
deleted file mode 100644
index 97e20a3..0000000
--- a/modules/services/drone/server/default.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  cfg = config.my.services.drone;
-  secrets = config.age.secrets;
-in
-{
-  config = lib.mkIf cfg.enable {
-    systemd.services.drone-server = {
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig = {
-        EnvironmentFile = [ cfg.sharedSecretFile ];
-        Environment = [
-          "DRONE_DATABASE_DRIVER=sqlite3"
-          "DRONE_DATABASE_DATASOURCE=/var/lib/drone-server/drone.sqlite"
-          "DRONE_SERVER_HOST=${cfg.vhostName}"
-          "DRONE_SERVER_PROTO=https"
-          "DRONE_SERVER_PORT=:${toString cfg.port}"
-          "DRONE_USER_CREATE=username:${cfg.admin},admin:true"
-          "DRONE_JSONNET_ENABLED=true"
-          "DRONE_STARLARK_ENABLED=true"
-        ];
-        StateDirectory = "drone-server";
-        ExecStart = "${pkgs.drone}/bin/drone-server";
-        User = "drone";
-        Group = "drone";
-      };
-    };
-
-    users.users.drone = {
-      isSystemUser = true;
-      createHome = true;
-      group = "drone";
-    };
-
-    users.groups.drone = { };
-
-    services.nginx.virtualHosts."${cfg.vhostName}" = {
-      forceSSL = true;
-      useACMEHost = cfg.vhostName;
-      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" ]; };
-  };
-}
diff --git a/tools/dnsupdate/main.go b/tools/dnsupdate/main.go
index 6748ee9..fcac9f1 100644
--- a/tools/dnsupdate/main.go
+++ b/tools/dnsupdate/main.go
@@ -19,7 +19,6 @@ var desiredRecords = []string{
 	"bt",
 	"cs",
 	"dash",
-	"drone",
 	"music",
 	"unifi",
 }
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-26 03:46:15 +0000