From a1632c8dbac6535bfc563ab25be54cd1b3486364 Mon Sep 17 00:00:00 2001 From: Dmitriy Pleshevskiy Date: Wed, 24 May 2023 11:42:28 +0300 Subject: [PATCH] host/magenta: use new configs instead of deprecated --- nixos/hosts/magenta/default.nix | 2 +- nixos/hosts/magenta/services/gitea.nix | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/nixos/hosts/magenta/default.nix b/nixos/hosts/magenta/default.nix index 61f8cef..68d7d8e 100644 --- a/nixos/hosts/magenta/default.nix +++ b/nixos/hosts/magenta/default.nix @@ -21,8 +21,8 @@ in ]; boot.kernelPackages = pkgs.linuxPackages_6_1; + boot.tmp.cleanOnBoot = true; - boot.cleanTmpDir = true; zramSwap.enable = true; networking.hostName = "magenta"; diff --git a/nixos/hosts/magenta/services/gitea.nix b/nixos/hosts/magenta/services/gitea.nix index 21d3df5..31115df 100644 --- a/nixos/hosts/magenta/services/gitea.nix +++ b/nixos/hosts/magenta/services/gitea.nix @@ -2,6 +2,7 @@ let hostname = "git.pleshevski.ru"; + httpPort = 9901; giteaCfg = config.services.gitea; @@ -16,10 +17,7 @@ in services.gitea = { enable = true; - httpPort = 9901; package = pkgs.unstable.gitea; - domain = hostname; - rootUrl = "https://${hostname}"; appName = "Pleshevskiy's Gitea"; mailerPasswordFile = config.age.secrets.gitea-smtp-passfile.path; database = { @@ -38,6 +36,9 @@ in LOG_SQL = false; }; server = { + DOMAIN = hostname; + HTTP_PORT = httpPort; + ROOT_URL = "https://${hostname}"; LANDING_PAGE = "explore"; }; service = { @@ -119,7 +120,7 @@ in }; services.gitea = { loadBalancer.servers = [ - { url = "http://host.docker.internal:${toString giteaCfg.httpPort}"; } + { url = "http://host.docker.internal:${toString httpPort}"; } ]; }; };