From b06ce5c9dc8fc018f60d157af930920a9d270014 Mon Sep 17 00:00:00 2001 From: Chris Toph Date: Sat, 15 Feb 2025 22:17:51 -0500 Subject: [PATCH] Remove forgejo module in favor of docker --- .../archive}/forgejo/default.nix | 28 +++++++++++++++---- host/komodo/default.nix | 4 +-- 2 files changed, 24 insertions(+), 8 deletions(-) rename {host/komodo/modules => common/archive}/forgejo/default.nix (70%) diff --git a/host/komodo/modules/forgejo/default.nix b/common/archive/forgejo/default.nix similarity index 70% rename from host/komodo/modules/forgejo/default.nix rename to common/archive/forgejo/default.nix index 4b66647..52ed3a2 100644 --- a/host/komodo/modules/forgejo/default.nix +++ b/common/archive/forgejo/default.nix @@ -7,6 +7,17 @@ ... }: { + + # users.users.git = { + # description = "git"; + # uid = 993; + # group = "ryot"; + # shell = pkgs.fish; + # # openssh.authorizedKeys.keys = [ + # # "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIClZstYoT64zHnGfE7LMYNiQPN5/gmCt382lC+Ji8lrH PVE" + # # ]; + # }; + # Forgejo configuration services.forgejo = { enable = true; @@ -22,10 +33,13 @@ }; settings = { + DEFAULT = { - # Configuration for Gitea + # Configuration for forgejo + I_AM_BEING_UNSAFE_RUNNING_AS_ROOT = "true"; APP_NAME = "Ryot Git"; RUN_MODE = "dev"; + RUN_USER = "toph"; }; server = { @@ -34,7 +48,9 @@ HTTP_ADDR = "127.0.0.1"; HTTP_PORT = 3003; ROOT_URL = "https://git.ryot.foo/"; - # SSH_PORT = 222; + START_SSH_SERVER = true; + BUILTIN_SSH_SERVER_USER = "git"; + SSH_PORT = 222; }; repository = { @@ -47,9 +63,9 @@ }; "ui.meta" = { - AUTHOR = "Ryot"; - DESCRIPTION = "Ryot Gitea instance"; - KEYWORDS = ""; + AUTHOR = "Ryot"; + DESCRIPTION = "Ryot Gitea instance"; + KEYWORDS = ""; }; security = { @@ -86,5 +102,5 @@ }; # Give admin group access to forgejo config - users.users.${admin}.extraGroups = [ "forgejo" ]; + # users.users.${admin}.extraGroups = [ "forgejo" ]; } diff --git a/host/komodo/default.nix b/host/komodo/default.nix index 8ea2a36..7b953ea 100644 --- a/host/komodo/default.nix +++ b/host/komodo/default.nix @@ -20,7 +20,7 @@ # Local Modules ./modules/caddy ./modules/frp - ./modules/forgejo + # ./modules/forgejo ./modules/komodo ]; @@ -30,7 +30,7 @@ [REDACTED] [REDACTED] [REDACTED] - # 222 # Forgejo SSH + 222 # Forgejo SSH [REDACTED] [REDACTED] [REDACTED]