From f14637d878916b830371375e3904e906db3c8196 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vili=20Sinerv=C3=A4?= Date: Wed, 4 Jun 2025 00:42:30 +0300 Subject: [PATCH] Migrate from Gitea to Forgejo --- machine-confs/{gitea.nix => forgejo.nix} | 4 ++-- misc/custom-iso-base.nix | 2 +- misc/template-configuration.nix | 4 ++-- services/{gitea.nix => forgejo.nix} | 21 ++++++++++++--------- services/siit-dc.nix | 2 +- 5 files changed, 18 insertions(+), 15 deletions(-) rename machine-confs/{gitea.nix => forgejo.nix} (63%) rename services/{gitea.nix => forgejo.nix} (67%) diff --git a/machine-confs/gitea.nix b/machine-confs/forgejo.nix similarity index 63% rename from machine-confs/gitea.nix rename to machine-confs/forgejo.nix index 9356f1f..53f4f78 100644 --- a/machine-confs/gitea.nix +++ b/machine-confs/forgejo.nix @@ -1,10 +1,10 @@ { ... }: { - networking.hostName = "gitea"; + networking.hostName = "forgejo"; imports = [ ../base.nix - ../services/gitea.nix + ../services/forgejo.nix ]; # HARDWARE SPECIFIC diff --git a/misc/custom-iso-base.nix b/misc/custom-iso-base.nix index 1c65a3a..37d10ab 100644 --- a/misc/custom-iso-base.nix +++ b/misc/custom-iso-base.nix @@ -46,7 +46,7 @@ let nixos-generate-config --root /mnt mv /mnt/etc/nixos/configuration.nix configuration.nix.old - curl https://gitea.sinerva.eu/VSinerva/nixos-conf/raw/branch/main/misc/template-configuration.nix -o /mnt/etc/nixos/configuration.nix + curl https://forgejo.sinerva.eu/VSinerva/nixos-conf/raw/branch/main/misc/template-configuration.nix -o /mnt/etc/nixos/configuration.nix ''; in { diff --git a/misc/template-configuration.nix b/misc/template-configuration.nix index b7d0426..37e2cf4 100644 --- a/misc/template-configuration.nix +++ b/misc/template-configuration.nix @@ -4,8 +4,8 @@ let stateVersion = "24.11"; repo = builtins.fetchGit { - url = "https://gitea.sinerva.eu/VSinerva/nixos-conf.git"; - name = "nixos-conf-gitea"; + url = "https://forgejo.sinerva.eu/VSinerva/nixos-conf.git"; + name = "nixos-conf-forgejo"; ref = "main"; }; in diff --git a/services/gitea.nix b/services/forgejo.nix similarity index 67% rename from services/gitea.nix rename to services/forgejo.nix index b94fd65..52031b8 100644 --- a/services/gitea.nix +++ b/services/forgejo.nix @@ -11,26 +11,28 @@ }; services = { - gitea = { + forgejo = { enable = true; lfs.enable = true; - appName = "Gitea for Vili Sinervä"; - mailerPasswordFile = "${config.services.gitea.stateDir}/smtp_pass"; + secrets.mailer.PASSWD = "${config.services.forgejo.stateDir}/smtp_pass"; settings = { + DEFAULT.APP_NAME = "Forgejo for Vili Sinervä"; repository = { ENABLE_PUSH_CREATE_USER = true; + ENABLE_PUSH_CREATE_ORG = true; + DEFAULT_REPO_UNITS = "repo.code,repo.releases"; }; ui.DEFAULT_SHOW_FULL_NAME = true; - "ui.meta".AUTHOR = "Gitea, hosted by Vili Sinervä"; + "ui.meta".AUTHOR = "Forgeo, hosted by Vili Sinervä"; server = { - DOMAIN = "gitea.sinerva.eu"; + DOMAIN = "forgejo.sinerva.eu"; + HTTP_ADDR = "::1"; HTTP_PORT = 8000; - ROOT_URL = "https://${config.services.gitea.settings.server.DOMAIN}"; + ROOT_URL = "https://${config.services.forgejo.settings.server.DOMAIN}"; }; service = { DISABLE_REGISTRATION = true; # Disable for initial setup - ENABLE_PASSKEY_AUTHENTICATION = true; }; session.COOKIE_SECURE = true; mailer = { @@ -38,7 +40,8 @@ SMTP_ADDR = "smtp.gmail.com"; SMTP_PORT = 587; USER = "vmsskv12@gmail.com"; # Password set in file - FROM = "gitea@sinerva.eu"; + FROM = "forgejo@sinerva.eu"; + ENVELOPE_FROM = "forgejo@sinerva.eu"; }; cron = { ENABLED = true; @@ -55,7 +58,7 @@ recommendedTlsSettings = true; recommendedProxySettings = true; - virtualHosts.${config.services.gitea.settings.server.DOMAIN} = { + virtualHosts.${config.services.forgejo.settings.server.DOMAIN} = { enableACME = true; forceSSL = true; kTLS = true; diff --git a/services/siit-dc.nix b/services/siit-dc.nix index 228e717..2a9430a 100644 --- a/services/siit-dc.nix +++ b/services/siit-dc.nix @@ -17,7 +17,7 @@ in "ipv4 prefix" = "${v4_pref}.1/32"; } { - # Gitea + # Forgejo "ipv6 prefix" = "${config.custom.gua_pref}d2:be24:11ff:feee:9c55/128"; "ipv4 prefix" = "${v4_pref}.2/32"; }