forgejo: add pyrox0 as maintainer, nixos/forgejo: fix builtin ssh conditional, replace GITEA_ prefix in env with FORGEJO_ (#364703)

This commit is contained in:
Adam C. Stephens
2024-12-12 17:38:28 -05:00
committed by GitHub
2 changed files with 9 additions and 9 deletions
+8 -9
View File
@@ -784,14 +784,14 @@ 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);
};
services.openssh.settings.AcceptEnv = mkIf (!cfg.settings.START_SSH_SERVER or false) "GIT_PROTOCOL";
services.openssh.settings.AcceptEnv = mkIf (
!cfg.settings.server.START_SSH_SERVER or false
) "GIT_PROTOCOL";
users.users = mkIf (cfg.user == "forgejo") {
forgejo = {
@@ -814,10 +814,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 = {
@@ -842,5 +840,6 @@ in
meta.maintainers = with lib.maintainers; [
bendlas
emilylange
pyrox0
];
}
+1
View File
@@ -195,6 +195,7 @@ buildGoModule rec {
bendlas
adamcstephens
marie
pyrox0
];
broken = stdenv.hostPlatform.isDarwin;
mainProgram = "gitea";