diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-01-02 12:01:25 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-02 12:01:25 +0000 |
| commit | f7f34e15c19aab2365c3830f5abddab72e3f7f26 (patch) | |
| tree | b318b8cc3894b9843168f4e37ada8bb43f337297 /nixos/modules | |
| parent | 31712833427c4dae73d743b7c3f140d07640f28c (diff) | |
| parent | f3736db70dff1b0dd106a922c197152e6cb7977d (diff) | |
| download | nixpkgs-f7f34e15c19aab2365c3830f5abddab72e3f7f26.tar nixpkgs-f7f34e15c19aab2365c3830f5abddab72e3f7f26.tar.gz nixpkgs-f7f34e15c19aab2365c3830f5abddab72e3f7f26.tar.bz2 nixpkgs-f7f34e15c19aab2365c3830f5abddab72e3f7f26.tar.lz nixpkgs-f7f34e15c19aab2365c3830f5abddab72e3f7f26.tar.xz nixpkgs-f7f34e15c19aab2365c3830f5abddab72e3f7f26.tar.zst nixpkgs-f7f34e15c19aab2365c3830f5abddab72e3f7f26.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/misc/gitea.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index ceb4c117285..00e90f5b32b 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -395,7 +395,7 @@ in ROOT_URL = cfg.rootUrl; } (mkIf cfg.enableUnixSocket { - PROTOCOL = "unix"; + PROTOCOL = "http+unix"; HTTP_ADDR = "/run/gitea/gitea.sock"; }) (mkIf (!cfg.enableUnixSocket) { @@ -404,7 +404,6 @@ in }) (mkIf cfg.lfs.enable { LFS_START_SERVER = true; - LFS_CONTENT_PATH = cfg.lfs.contentDir; }) ]; @@ -426,6 +425,10 @@ in oauth2 = { JWT_SECRET = "#oauth2jwtsecret#"; }; + + lfs = mkIf (cfg.lfs.enable) { + PATH = cfg.lfs.contentDir; + }; }; services.postgresql = optionalAttrs (usePostgresql && cfg.database.createDatabase) { |