From d8c841333b02ce825b88772d7240b82a1a09b265 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sun, 23 Apr 2023 16:23:36 +0100 Subject: [PATCH] modules: services: gitea: migrate settings Most of the settings are now RFC-42 compliant. --- modules/services/gitea/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/services/gitea/default.nix b/modules/services/gitea/default.nix index 9349cd1..28a448d 100644 --- a/modules/services/gitea/default.nix +++ b/modules/services/gitea/default.nix @@ -56,9 +56,6 @@ in enable = true; appName = "Ambroisie's forge"; - httpPort = cfg.port; - domain = giteaDomain; - rootUrl = "https://${giteaDomain}"; user = "git"; lfs.enable = true; @@ -78,6 +75,12 @@ in mailerPasswordFile = lib.mkIf cfg.mail.enable cfg.mail.passwordFile; settings = { + server = { + HTTP_PORT = cfg.port; + DOMAIN = giteaDomain; + ROOT_URL = "https://${giteaDomain}"; + }; + mailer = lib.mkIf cfg.mail.enable { ENABLED = true; HOST = cfg.mail.host; @@ -121,7 +124,7 @@ in # Redirect `gitea.` to actual forge subdomain { subdomain = "gitea"; - redirect = config.services.gitea.rootUrl; + redirect = config.services.gitea.settings.server.ROOT_URL; } ];