From 12e42275b555bf5300968c33c0dc19653d88c3ac Mon Sep 17 00:00:00 2001 From: Satria Date: Sat, 7 Mar 2026 13:08:17 +0700 Subject: [PATCH 1/3] forgejo migration fix --- modules/system/homelab/git.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/system/homelab/git.nix b/modules/system/homelab/git.nix index eb343f9..0923971 100644 --- a/modules/system/homelab/git.nix +++ b/modules/system/homelab/git.nix @@ -3,6 +3,14 @@ enable = true; lfs.enable = true; stateDir = "/mnt/data/forgejo"; + secrets = { + oauth2.JWT_SECRET = "/mnt/data/forgejo/custom/conf/oauth2_jwt_secret"; + server.LFS_JWT_SECRET = "/mnt/data/forgejo/custom/conf/lfs_jwt_secret"; + security = { + INTERNAL_TOKEN = "/mnt/data/forgejo/custom/conf/internal_token"; + SECRET_KEY = "/mnt/data/forgejo/custom/conf/secret_key"; + }; + }; settings = { server = { DISABLE_SSH = true; @@ -31,4 +39,4 @@ }; }; }; -} \ No newline at end of file +} From 32c1205a516a7b832c4f5e0292f62aaa5a7041c3 Mon Sep 17 00:00:00 2001 From: Satria Date: Sat, 7 Mar 2026 13:33:12 +0700 Subject: [PATCH 2/3] forgejo use latest and update --- flake.lock | 6 +++--- modules/system/homelab/git.nix | 19 ++++++++++--------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index e877782..63ea904 100644 --- a/flake.lock +++ b/flake.lock @@ -62,11 +62,11 @@ ] }, "locked": { - "lastModified": 1772807318, - "narHash": "sha256-Qjw6ILt8cb2HQQpCmWNLMZZ63wEo1KjTQt+1BcQBr7k=", + "lastModified": 1772845525, + "narHash": "sha256-Dp5Ir2u4jJDGCgeMRviHvEQDe+U37hMxp6RSNOoMMPc=", "owner": "nix-community", "repo": "home-manager", - "rev": "daa2c221320809f5514edde74d0ad0193ad54ed8", + "rev": "27b93804fbef1544cb07718d3f0a451f4c4cd6c0", "type": "github" }, "original": { diff --git a/modules/system/homelab/git.nix b/modules/system/homelab/git.nix index 0923971..c5c5a9a 100644 --- a/modules/system/homelab/git.nix +++ b/modules/system/homelab/git.nix @@ -1,16 +1,17 @@ -{ homelab, ... }: { +{ pkgs, homelab, ... }: { services.forgejo = { enable = true; lfs.enable = true; stateDir = "/mnt/data/forgejo"; - secrets = { - oauth2.JWT_SECRET = "/mnt/data/forgejo/custom/conf/oauth2_jwt_secret"; - server.LFS_JWT_SECRET = "/mnt/data/forgejo/custom/conf/lfs_jwt_secret"; - security = { - INTERNAL_TOKEN = "/mnt/data/forgejo/custom/conf/internal_token"; - SECRET_KEY = "/mnt/data/forgejo/custom/conf/secret_key"; - }; - }; + package = pkgs.forgejo; + #secrets = { + # oauth2.JWT_SECRET = "/mnt/data/forgejo/custom/conf/oauth2_jwt_secret"; + # server.LFS_JWT_SECRET = "/mnt/data/forgejo/custom/conf/lfs_jwt_secret"; + # security = { + # INTERNAL_TOKEN = "/mnt/data/forgejo/custom/conf/internal_token"; + # SECRET_KEY = "/mnt/data/forgejo/custom/conf/secret_key"; + # }; + #}; settings = { server = { DISABLE_SSH = true; From eed61b5940faa1f740bc0e1472c19c0c968cdfbb Mon Sep 17 00:00:00 2001 From: Satria Date: Sat, 7 Mar 2026 13:46:15 +0700 Subject: [PATCH 3/3] update cf routes correction --- modules/system/homelab/tunnels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/system/homelab/tunnels.nix b/modules/system/homelab/tunnels.nix index 93352d7..8cf0fb6 100644 --- a/modules/system/homelab/tunnels.nix +++ b/modules/system/homelab/tunnels.nix @@ -1,6 +1,6 @@ { pkgs, lib, homelab, ... }: let routes = { - "git.${homelab.domain}" = "http://localhost:3000"; + "git.${homelab.domain}" = "http://localhost:5080"; "auth.${homelab.domain}" = "http://localhost:1411"; "dash.${homelab.domain}" = "http://localhost:5070"; "media.${homelab.domain}" = "http://localhost:8096"; @@ -34,4 +34,4 @@ in { ${pkgs.cloudflared}/bin/cloudflared tunnel --origincert /mnt/data/cloudflared/cert.pem route dns ${homelab.cf-tunnel-id} ${domain} || true '') (builtins.attrNames routes); }; -} \ No newline at end of file +}