From b46eca16b0b207d14e173d4e40286160749c5c07 Mon Sep 17 00:00:00 2001
From: Brendan Golden <git@brendan.ie>
Date: Thu, 9 Jan 2025 22:53:14 +0000
Subject: [PATCH] fix: switch over to usign ``active-git`` instead of
 ``active-gitlab``

---
 .forgejo/workflows/deploy.yaml         | 2 +-
 .forgejo/workflows/deploy_forgejo.yaml | 2 +-
 .gitlab-ci.yml                         | 4 ++--
 README.md                              | 6 +++---
 machines/glados.nix                    | 2 +-
 machines/wheatly.nix                   | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml
index 0d0e32f..b3f6453 100644
--- a/.forgejo/workflows/deploy.yaml
+++ b/.forgejo/workflows/deploy.yaml
@@ -37,7 +37,7 @@ jobs:
 #      - 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
+#      - run: colmena build -v --on @active-git
 
   deploy_dns:
     runs-on: nix
diff --git a/.forgejo/workflows/deploy_forgejo.yaml b/.forgejo/workflows/deploy_forgejo.yaml
index 8a07870..0fee7f9 100644
--- a/.forgejo/workflows/deploy_forgejo.yaml
+++ b/.forgejo/workflows/deploy_forgejo.yaml
@@ -8,5 +8,5 @@ jobs:
     runs-on: nix
     steps:
       - uses: actions/checkout@v4
-      - run: colmena apply -v --on @active-gitlab --show-trace
+      - run: colmena apply -v --on @active-git --show-trace
         shell: bash
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9a921fc..8b6254c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -124,7 +124,7 @@ build:
     - colmena build -v --on @active-core
     - colmena build -v --on @active
     - colmena build -v --on @active-ext
-    - colmena build -v --on @active-gitlab
+    - colmena build -v --on @active-git
 
 # dns always has to be deployed first
 deploy_dns:
@@ -167,5 +167,5 @@ deploy_gitlab:
   <<: *deployment
   stage: deploy_gitlab
   script:
-    - colmena apply -v --on @active-gitlab
+    - colmena apply -v --on @active-git
   when: manual
diff --git a/README.md b/README.md
index f98fd97..1990b82 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ colmena build --on @active-dns
 Deploying is putting (apply-ing) the config tat was built onto the server, there is no need to build first, it will automatically do so.
 
 While the ***recommended way of deploying is using the CI/CD process*** there are times when you will have to manually deploy the config.  
-One such case is the ``@active-gitlab`` group if either Gitlab or Gitlab-runner got updated.  
+One such case is the ``@active-git`` group if either Gitlab or Gitlab-runner got updated.  
 Another is if ye have fecked up DNS.
 
 Your ``~/.ssh/config``  should be set up as follows and you should be a member of ``skynet-admins-linux``
@@ -60,10 +60,10 @@ Then you can run the following commands like so:
 ```shell
 colmena apply
 colmena apply --on @active-dns
-colmena apply --on @active-gitlab
+colmena apply --on @active-git
 ```
 
-The CI/CD pipeline has a manual job that can be triggered to update ``@active-gitlab`` if you know it wont cause issues.
+The CI/CD pipeline has a manual job that can be triggered to update ``@active-git`` if you know it wont cause issues.
 
 ### Agenix
 
diff --git a/machines/glados.nix b/machines/glados.nix
index cb2040e..842da0c 100644
--- a/machines/glados.nix
+++ b/machines/glados.nix
@@ -35,7 +35,7 @@ in {
     targetPort = 22;
     targetUser = null;
 
-    tags = ["active-gitlab"];
+    tags = ["active-git"];
   };
 
   services.skynet = {
diff --git a/machines/wheatly.nix b/machines/wheatly.nix
index cbd6d4f..f38000b 100644
--- a/machines/wheatly.nix
+++ b/machines/wheatly.nix
@@ -33,7 +33,7 @@ in {
     targetPort = 22;
     targetUser = null;
 
-    tags = ["active-gitlab"];
+    tags = ["active-git"];
   };
 
   services.skynet = {