diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index a30a033..6814808 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -1,7 +1,7 @@ { imports = [ ./copyparty.nix - # ./forgejo.nix + ./forgejo.nix ./immich.nix ./jellyfin.nix # ./minecraft.nix diff --git a/modules/nixos/forgejo.nix b/modules/nixos/forgejo.nix index c808cad..1d37d58 100644 --- a/modules/nixos/forgejo.nix +++ b/modules/nixos/forgejo.nix @@ -1,58 +1,22 @@ -{ inputs, ... }: +{ config, ... }: { - containers.git = { - autoStart = true; - bindMounts."/etc/ssh/ssh_host_ed25519_key".hostPath = "/etc/ssh/ssh_host_ed25519_key"; - - config = { - imports = [ inputs.agenix.nixosModules.default ]; - - age = { - identityPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; - secrets."forgejo-runner-token" = { - file = ../secrets/forgejo-runner-token.age; - mode = "400"; - owner = "forgejo"; + services = { + forgejo = { + enable = true; + database.type = "postgres"; + lfs.enable = true; + settings = { + service.DISABLE_REGISTRATION = true; + server = { + DOMAIN = "git.alpine-centauri.ts.net"; + ROOT_URL = "https://${config.services.forgejo.settings.server.DOMAIN}"; + # HTTP_PORT = 3000; + }; + actions = { + ENABLED = true; + DEFAULT_ACTIONS_URL = "github"; }; }; - - services = { - forgejo = { - enable = true; - database.type = "postgres"; - lfs.enable = true; - settings = { - server = { - DOMAIN = "git.alpine-centauri.ts.net"; - ROOT_URL = "https://git.alpine-centauri.ts.net/"; - HTTP_PORT = 3000; - }; - actions = { - ENABLED = true; - DEFAULT_ACTIONS_URL = "https://code.forgejo.org"; - }; - }; - }; - - # gitea-actions-runner = { - # package = pkgs.forgejo-runner; - # instances.native = { - # enable = true; - # name = "native"; - # url = "https://git.alpine-centauri.ts.net"; - # tokenFile = config.age.secrets.forgejo-runner-token.path; - # labels = [ "native:host" ]; - # }; - # }; - - tailscale = { - enable = true; - useRoutingFeatures = "server"; - interfaceName = "userspace-networking"; - }; - }; - - system.stateVersion = "24.05"; }; }; } diff --git a/modules/secrets/forgejo-runner-token.age b/modules/secrets/forgejo-runner-token.age deleted file mode 100644 index 3562c66..0000000 Binary files a/modules/secrets/forgejo-runner-token.age and /dev/null differ diff --git a/modules/secrets/secrets.nix b/modules/secrets/secrets.nix index a00b39a..eb3f3ca 100644 --- a/modules/secrets/secrets.nix +++ b/modules/secrets/secrets.nix @@ -8,7 +8,6 @@ let in { "copyparty-jan.age".publicKeys = all; - "forgejo-runner-token.age".publicKeys = all; "paperless-admin.age".publicKeys = all; "tailscale.age".publicKeys = all; }