diff --git a/hosts/ABOUTME.md b/hosts/ABOUTME.md index e29903c..6c6a4a2 100644 --- a/hosts/ABOUTME.md +++ b/hosts/ABOUTME.md @@ -28,20 +28,20 @@ hosts/ ## Managed Hosts -| Folder | Host | Role | -| ------------- | ---------- | ------------------------------------------------------------------------ | -| `fwbook/` | fwbook | Framework 13 AMD — personal laptop / daily driver | -| `hl-fwdesk/` | hl-fwdesk | Framework Desktop AI Max 300 — AI workstation | -| `hl-fws1/` | hl-fws1 | Framework 11th Intel — K3s server node | -| `hl-bigbox1/` | hl-bigbox1 | AI/compute server (NVIDIA + AMD) | -| `hl-bigbox2/` | hl-bigbox2 | NFS storage server | -| `hl-minipc1/` | hl-minipc1 | Core infra: Gitea, nix-serve, registry, Buzz (docker, `buzz-manage` CLI) | -| `hl-minipc2/` | hl-minipc2 | Container/media server | -| `hl-minipc3/` | hl-minipc3 | K3s worker node; central Caddy reverse-proxy (`*.home.sosnovsky.ca`) | -| `hl-pi1/` | hl-pi1 | Raspberry Pi CM4 (aarch64) — headless server, SSH only | -| `hl-pi2/` | hl-pi2 | Raspberry Pi 4 (aarch64) — headless server, SSH only | -| `hl-terra1/` | hl-terra1 | NFS storage + Jellyfin backup | -| `iso/` | iso | Bootable NixOS installer image | +| Folder | Host | Role | +| ------------- | ---------- | -------------------------------------------------------------------------------------------------- | +| `fwbook/` | fwbook | Framework 13 AMD — personal laptop / daily driver | +| `hl-fwdesk/` | hl-fwdesk | Framework Desktop AI Max 300 — AI workstation | +| `hl-fws1/` | hl-fws1 | Framework 11th Intel — K3s server node | +| `hl-bigbox1/` | hl-bigbox1 | AI/compute server (NVIDIA + AMD) | +| `hl-bigbox2/` | hl-bigbox2 | NFS storage server | +| `hl-minipc1/` | hl-minipc1 | Core infra: Gitea (native or containerized), nix-serve, registry, Buzz (docker, `buzz-manage` CLI) | +| `hl-minipc2/` | hl-minipc2 | Container/media server | +| `hl-minipc3/` | hl-minipc3 | K3s worker node; central Caddy reverse-proxy (`*.home.sosnovsky.ca`) | +| `hl-pi1/` | hl-pi1 | Raspberry Pi CM4 (aarch64) — headless server, SSH only | +| `hl-pi2/` | hl-pi2 | Raspberry Pi 4 (aarch64) — headless server, SSH only | +| `hl-terra1/` | hl-terra1 | NFS storage + Jellyfin backup | +| `iso/` | iso | Bootable NixOS installer image | ## Rules diff --git a/hosts/hl-minipc1/services/default.nix b/hosts/hl-minipc1/services/default.nix index 8a5e2b4..39bbc81 100644 --- a/hosts/hl-minipc1/services/default.nix +++ b/hosts/hl-minipc1/services/default.nix @@ -4,6 +4,7 @@ ./nix-serve.nix ./docker-registry.nix ./gitea.nix + ./gitea-container.nix ./acme.nix ./portainer.nix ./iu.nix diff --git a/hosts/hl-minipc1/services/gitea-container.nix b/hosts/hl-minipc1/services/gitea-container.nix new file mode 100644 index 0000000..3aeea4e --- /dev/null +++ b/hosts/hl-minipc1/services/gitea-container.nix @@ -0,0 +1,74 @@ +{ config, lib, pkgs, ... }: +let + gitea = { + user = "gitea"; + group = "gitea"; + stateDir = "/var/lib/sosnovsky/gitea"; + httpPort = 3000; + sshPort = 22; + }; + app = config.skyg.internalNetworkingMap.apps.gitea; + containerMode = !config.services.gitea.enable; + uidEnvFile = "/run/gitea-container.env"; +in +{ + users.users.gitea = lib.mkIf containerMode { + isSystemUser = true; + group = gitea.group; + home = gitea.stateDir; + useDefaultShell = true; + }; + users.groups.gitea = lib.mkIf containerMode { }; + + systemd.services.gitea-container-uid = lib.mkIf containerMode { + description = "Resolve gitea uid/gid for the container"; + wantedBy = [ "container-services-gitea.service" ]; + before = [ "container-services-gitea.service" ]; + path = [ pkgs.coreutils ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + script = '' + printf 'USER_UID=%s\nUSER_GID=%s\n' \ + "$(id -u ${gitea.user})" "$(id -g ${gitea.user})" > ${uidEnvFile} + ''; + }; + + systemd.tmpfiles.rules = lib.mkIf containerMode [ + "d ${gitea.stateDir} 0750 ${gitea.user} ${gitea.group} -" + ]; + + skyg.nixos.common.container-services.gitea = { + enable = containerMode; + autoUpdate.enable = true; + networks.lan = config.skyg.nixos.common.containers.networks.ipvlanLab.compose; + services.gitea = { + # Match the native package so toggling never triggers a DB migration. + image = "gitea/gitea:${pkgs.gitea.version}"; + networks.lan.ipv4_address = app.ip; + environmentFiles = [ uidEnvFile ]; + environment = { + # Same data, same paths as the native service. + GITEA_WORK_DIR = gitea.stateDir; + GITEA_CUSTOM = "${gitea.stateDir}/custom"; + GITEA_APP_INI = "${gitea.stateDir}/conf/app.ini"; + GITEA__server__APP_DATA_PATH = "${gitea.stateDir}/data"; + GITEA__server__SSH_ROOT_PATH = "${gitea.stateDir}/.ssh"; + GITEA__repository__ROOT = "${gitea.stateDir}/repositories"; + GITEA__database__PATH = "${gitea.stateDir}/data/gitea.db"; + GITEA__log__ROOT_PATH = "${gitea.stateDir}/log"; + # The container has its own IP, so it serves SSH itself (same keys). + GITEA__server__START_SSH_SERVER = "true"; + GITEA__server__SSH_LISTEN_PORT = toString gitea.sshPort; + GITEA__server__SSH_PORT = toString gitea.sshPort; + GITEA__server__SSH_USER = gitea.user; + GITEA__server__DOMAIN = app.effectiveDns; + GITEA__server__HTTP_PORT = toString gitea.httpPort; + GITEA__server__ROOT_URL = "http://${app.effectiveDns}:${toString gitea.httpPort}/"; + GITEA__service__DISABLE_REGISTRATION = "true"; + }; + volumes = [ "${gitea.stateDir}:${gitea.stateDir}" ]; + }; + }; +} diff --git a/modules/main.nix b/modules/main.nix index 662f526..2845300 100644 --- a/modules/main.nix +++ b/modules/main.nix @@ -107,6 +107,7 @@ in drawdb = { ip = "10.0.101.2"; }; buzz = { ip = "10.0.101.3"; aliases = [ "buzz.home.sosnovsky.ca" ]; }; audiobooks = { ip = "10.0.101.4"; }; + gitea = { ip = "10.0.101.8"; }; jellyfin = { ip = "10.0.101.5"; }; nvr = { ip = "10.0.101.6"; }; portainer = { ip = "10.0.101.241"; };