flake.lock

@@ -749,11 +749,11 @@
     "ofborg": {
       "flake": false,
       "locked": {
-        "lastModified": 1734308727,
-        "narHash": "sha256-/bJhMZQ5VSblvgqAR9hSLwdm5pxenn/UMY8pDDVSquI=",
+        "lastModified": 1734205511,
+        "narHash": "sha256-yyQ05iZ5OsSM68JAqFmLHcrvtQfKQfl5iKHEMUvC+wI=",
         "ref": "refs/heads/vcs-generalization",
-        "rev": "7bcc8fa584c66f317923337658974c0525e5779f",
-        "revCount": 1495,
+        "rev": "3af7e6976b995037132f971c6af78e00096ca9dd",
+        "revCount": 1487,
         "type": "git",
         "url": "https://git.lix.systems/the-distro/ofborg.git"
       },

hosts/bagel-box/default.nix

@@ -39,17 +39,9 @@
     postgres.enable = true;
     ofborg = {
       rabbitmq.enable = true;
-      pastebin.enable = true;
-      # TODO: statcheck.enable = true;
-
       mass-rebuilder.enable = true;
-      # TODO: enable once ready.
-      builder.enable = false;
-
-      gerrit-event-streamer.enable = true;
-      gerrit-generic-vcs-filter.enable = true;
-
-      # FIXME: plug into our prometheus stack.
+      pastebin.enable = true;
+      builder.enable = true;
       stats.enable = true;
     };
   };

secrets.nix

@@ -47,7 +47,6 @@ let
       postgres-ca-priv = [ machines.bagel-box ];
       postgres-tls-priv = [ machines.bagel-box ];
       rabbitmq-password = [ machines.bagel-box ];
-      gerrit-event-listener-ssh-key = [ machines.bagel-box ];
 
       newsletter-secrets = [ machines.public01 ];
       s3-revproxy-api-keys = [ machines.public01 ];

services/ofborg/default.nix

@@ -1,7 +1,7 @@
 { pkgs, config, lib, ... }:
 
 let
-  inherit (lib) mkIf mkMerge optional hasAttr;
+  inherit (lib) mkIf mkMerge;
   cfg = config.bagel.services.ofborg;
 
   amqpHost = "amqp.forkos.org";
@@ -18,14 +18,8 @@ let
       # TODO: more hardening.
       StateDirectory = "ofborg";
       LogsDirectory = "ofborg";
-      RuntimeDirectory = "ofborg";
       WorkingDirectory = "/var/lib/ofborg";
-      LoadCredential =
-        optional (hasAttr "rabbitmq-password" config.age.secrets) "rabbitmq-password:${config.age.secrets.rabbitmq-password.path}"
-        ++ optional (hasAttr "gerrit-event-listener-ssh-key" config.age.secrets) "gerrit-ssh-key:${config.age.secrets.gerrit-event-listener-ssh-key.path}";
-      Environment = [
-        "XDG_STATE_HOME=/run/ofborg"
-      ];
+      LoadCredential = [ "rabbitmq-password:${config.age.secrets.rabbitmq-password.path}" ];
     };
   };
 in {
@@ -37,8 +31,7 @@ in {
     mass-rebuilder.enable = mkEnableOption "ofborg evaluator worker for mass rebuilds jobs";
     stats.enable = mkEnableOption "ofborg prometheus worker";
 
-    gerrit-event-streamer.enable = mkEnableOption "ofborg's Gerrit event streamer";
-    gerrit-generic-vcs-filter.enable = mkEnableOption "ofborg's Gerrit event transformer to generic VCS events";
+    gerrit-events-streamer.enable = mkEnableOption "ofborg's Gerrit event streamer";
 
     package = mkPackageOption pkgs "ofborg" { };
 
@@ -49,6 +42,7 @@ in {
 
   config = mkMerge [
     {
+      age.secrets.rabbitmq-password.file = ../../secrets/floral/rabbitmq-password.age;
       # TODO: move this to global.
       bagel.services.ofborg.settings = {
         rabbitmq = {
@@ -90,14 +84,12 @@ in {
         vcs = "Gerrit";
         gerrit = {
           instance_uri = "cl.forkos.org";
-          username = "ofborg-event-listener";
           ssh_private_key_file = "$CREDENTIALS_DIRECTORY/gerrit-ssh-key";
           ssh_port = 29418;
         };
       };
     }
     (mkIf cfg.rabbitmq.enable {
-      age.secrets.rabbitmq-password.file = ../../secrets/floral/rabbitmq-password.age;
       services.nginx.enable = true;
       services.rabbitmq = {
         enable = true;
@@ -125,14 +117,8 @@ in {
     (mkIf cfg.statcheck-worker.enable {
       systemd.services.ofborg-statcheck-worker = mkOfborgWorker "statcheck-worker" { };
     })
-    (mkIf cfg.gerrit-event-streamer.enable {
-      age.secrets.gerrit-event-listener-ssh-key.file = ../../secrets/floral/gerrit-event-listener-ssh-key.age;
-      systemd.services.ofborg-gerrit-event-streamer = mkOfborgWorker "gerrit-event-streamer" {
-        path = [ pkgs.openssh ];
-      };
-    })
-    (mkIf cfg.gerrit-generic-vcs-filter.enable {
-      systemd.services.ofborg-gerrit-generic-vcs-filter = mkOfborgWorker "gerrit-generic-vcs-filter" { };
+    (mkIf cfg.gerrit-events-streamer.enable {
+      systemd.services.ofborg-gerrit-streamer = mkOfborgWorker "gerrit-events-streamer" { };
     })
     (mkIf cfg.mass-rebuilder.enable {
       systemd.services.ofborg-mass-rebuilder = mkOfborgWorker "mass-rebuilder" { };