From 665063ca71f3f5cc93ff185488221fa977f41370 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Wed, 24 Apr 2024 01:47:05 -0400 Subject: [PATCH] nixos/forgejo: replace `GITEA_` prefix in env with `FORGEJO_` Since https://codeberg.org/forgejo/forgejo/issues/497 has been resolved, these can now be `FORGEJO_` prefixed instead of `GITEA_`. Co-Authored-By: Emily --- nixos/modules/services/misc/forgejo.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/misc/forgejo.nix b/nixos/modules/services/misc/forgejo.nix index 299b574b4400..e80048871c71 100644 --- a/nixos/modules/services/misc/forgejo.nix +++ b/nixos/modules/services/misc/forgejo.nix @@ -784,10 +784,8 @@ in environment = { USER = cfg.user; HOME = cfg.stateDir; - # `GITEA_` prefix until https://codeberg.org/forgejo/forgejo/issues/497 - # is resolved. - GITEA_WORK_DIR = cfg.stateDir; - GITEA_CUSTOM = cfg.customDir; + FORGEJO_WORK_DIR = cfg.stateDir; + FORGEJO_CUSTOM = cfg.customDir; } // lib.listToAttrs (map (e: lib.nameValuePair e.env "%d/${e.env}") secrets); }; @@ -814,10 +812,8 @@ in environment = { USER = cfg.user; HOME = cfg.stateDir; - # `GITEA_` prefix until https://codeberg.org/forgejo/forgejo/issues/497 - # is resolved. - GITEA_WORK_DIR = cfg.stateDir; - GITEA_CUSTOM = cfg.customDir; + FORGEJO_WORK_DIR = cfg.stateDir; + FORGEJO_CUSTOM = cfg.customDir; }; serviceConfig = {