From 255b2395f7c57e9d89d66a89db3ff6cc3649374c Mon Sep 17 00:00:00 2001
From: Brendan Golden <git@brendan.ie>
Date: Wed, 7 Aug 2024 21:51:23 +0100
Subject: [PATCH] ci: add the final deploy config

---
 .forgejo/workflows/deploy.yaml | 52 ++++++++++++++++++++--------------
 machines/vendetta.nix          |  4 +--
 2 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml
index bca4b19..2e9aa37 100644
--- a/.forgejo/workflows/deploy.yaml
+++ b/.forgejo/workflows/deploy.yaml
@@ -15,31 +15,39 @@ on:
       - .forgejo/**/*
 
 jobs:
-#  linter:
-#    runs-on: nix
-#    steps:
-#      - uses: actions/checkout@v4
-#      - run: nix fmt -- --check .
-#
-#  #if: github.repository == 'Skynet/nixos'
-#  build:
-#    runs-on: nix
-#    steps:
-#      - uses: actions/checkout@v4
-#      - run: nix develop
-#      - run: colmena build -v --on @active-dns
-#      - run: colmena build -v --on @active-core
-#      - run: colmena build -v --on @active
-#      - run: colmena build -v --on @active-ext
-#      - run: colmena build -v --on @active-gitlab
+  linter:
+    runs-on: nix
+    steps:
+      - uses: actions/checkout@v4
+      - run: nix fmt -- --check .
+
+  #if: github.repository == 'Skynet/nixos'
+  build:
+    runs-on: nix
+    steps:
+      - uses: actions/checkout@v4
+      - run: nix develop
+      - run: colmena build -v --on @active-dns
+      - run: colmena build -v --on @active-core
+      - run: colmena build -v --on @active
+      - run: colmena build -v --on @active-ext
+      - run: colmena build -v --on @active-gitlab
 
   deploy_dns:
     runs-on: nix
-#    needs: [ linter, build ]
+    needs: [ linter, build ]
     steps:
       - uses: actions/checkout@v4
-      # setup deploy key
-      - run: |
-          ssh -vvv root@193.1.99.120
-          colmena apply -v --on vendetta --show-trace
+      - run: colmena apply -v --on @active-dns --show-trace
+        shell: bash
+
+  deploy_active:
+    strategy:
+      matrix:
+        batch: [ active-core, active, active-ext ]
+    runs-on: nix
+    needs: [ deploy_dns ]
+    steps:
+      - uses: actions/checkout@v4
+      - run: colmena apply -v --on @${{ matrix.batch }} --show-trace
         shell: bash
\ No newline at end of file
diff --git a/machines/vendetta.nix b/machines/vendetta.nix
index dd4205d..3cff501 100644
--- a/machines/vendetta.nix
+++ b/machines/vendetta.nix
@@ -33,11 +33,9 @@ in {
   deployment = {
     targetHost = ip_pub;
     targetPort = 22;
-    targetUser = "root";
+    targetUser = null;
 
     tags = ["active-dns" "dns"];
-
-    sshOptions = ["-vvv"];
   };
 
   networking = {