From 98136e802bc6aa72de13ecb53159815a985c2c5b Mon Sep 17 00:00:00 2001
From: Brendan Golden <git@brendan.ie>
Date: Tue, 6 Aug 2024 15:41:59 +0100
Subject: [PATCH] fix: git is important enough that it should have its own
 folder

---
 applications/{ => git}/gitlab.nix        | 12 ++++++------
 applications/{ => git}/gitlab_runner.nix |  4 ++--
 machines/glados.nix                      |  2 +-
 machines/wheatly.nix                     |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename applications/{ => git}/gitlab.nix (95%)
 rename applications/{ => git}/gitlab_runner.nix (96%)

diff --git a/applications/gitlab.nix b/applications/git/gitlab.nix
similarity index 95%
rename from applications/gitlab.nix
rename to applications/git/gitlab.nix
index a65c43e..0d90b7b 100644
--- a/applications/gitlab.nix
+++ b/applications/git/gitlab.nix
@@ -56,32 +56,32 @@ in {
     # grep -r --exclude-dir={docker,containers,log,sys,nix,proc}  gitlab /
 
     age.secrets.gitlab_pw = {
-      file = ../secrets/gitlab/pw.age;
+      file = ../../secrets/gitlab/pw.age;
       owner = cfg.user;
       group = cfg.user;
     };
     age.secrets.gitlab_secrets_db = {
-      file = ../secrets/gitlab/secrets_db.age;
+      file = ../../secrets/gitlab/secrets_db.age;
       owner = cfg.user;
       group = cfg.user;
     };
     age.secrets.gitlab_secrets_secret = {
-      file = ../secrets/gitlab/secrets_secret.age;
+      file = ../../secrets/gitlab/secrets_secret.age;
       owner = cfg.user;
       group = cfg.user;
     };
     age.secrets.gitlab_secrets_otp = {
-      file = ../secrets/gitlab/secrets_otp.age;
+      file = ../../secrets/gitlab/secrets_otp.age;
       owner = cfg.user;
       group = cfg.user;
     };
     age.secrets.gitlab_secrets_jws = {
-      file = ../secrets/gitlab/secrets_jws.age;
+      file = ../../secrets/gitlab/secrets_jws.age;
       owner = cfg.user;
       group = cfg.user;
     };
     age.secrets.gitlab_db_pw = {
-      file = ../secrets/gitlab/db_pw.age;
+      file = ../../secrets/gitlab/db_pw.age;
       owner = cfg.user;
       group = cfg.user;
     };
diff --git a/applications/gitlab_runner.nix b/applications/git/gitlab_runner.nix
similarity index 96%
rename from applications/gitlab_runner.nix
rename to applications/git/gitlab_runner.nix
index 13d296a..f5041bf 100644
--- a/applications/gitlab_runner.nix
+++ b/applications/git/gitlab_runner.nix
@@ -51,8 +51,8 @@ in {
       pkgs.gitlab-runner
     ];
 
-    age.secrets.runner_01_nix.file = ../secrets/gitlab/runners/runner01.age;
-    age.secrets.runner_02_general.file = ../secrets/gitlab/runners/runner02.age;
+    age.secrets.runner_01_nix.file = ../../secrets/gitlab/runners/runner01.age;
+    age.secrets.runner_02_general.file = ../../secrets/gitlab/runners/runner02.age;
 
     boot.kernel.sysctl."net.ipv4.ip_forward" = true; # 1
     virtualisation.docker.enable = true;
diff --git a/machines/glados.nix b/machines/glados.nix
index a745ee6..4a76b21 100644
--- a/machines/glados.nix
+++ b/machines/glados.nix
@@ -26,7 +26,7 @@ Notes:    Each user has roughly 20gb os storage
   };
 in {
   imports = [
-    ../applications/gitlab.nix
+    ../applications/git/gitlab.nix
   ];
 
   deployment = {
diff --git a/machines/wheatly.nix b/machines/wheatly.nix
index 308bef9..35f1f0f 100644
--- a/machines/wheatly.nix
+++ b/machines/wheatly.nix
@@ -25,7 +25,7 @@ Notes:
   };
 in {
   imports = [
-    ../applications/gitlab_runner.nix
+    ../applications/git/gitlab_runner.nix
   ];
 
   deployment = {