diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-01-02 12:02:01 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-02 12:02:01 +0000 |
| commit | ccef3ab7d8762c6e5c75688dfd2d0850d9469a33 (patch) | |
| tree | 249a64e917388cc956ae133390f81fc6b376d3e4 /nixos/modules | |
| parent | 051d49badb03c9c6587a6e50f4fccb4d897c137f (diff) | |
| parent | f7f34e15c19aab2365c3830f5abddab72e3f7f26 (diff) | |
| download | nixpkgs-ccef3ab7d8762c6e5c75688dfd2d0850d9469a33.tar nixpkgs-ccef3ab7d8762c6e5c75688dfd2d0850d9469a33.tar.gz nixpkgs-ccef3ab7d8762c6e5c75688dfd2d0850d9469a33.tar.bz2 nixpkgs-ccef3ab7d8762c6e5c75688dfd2d0850d9469a33.tar.lz nixpkgs-ccef3ab7d8762c6e5c75688dfd2d0850d9469a33.tar.xz nixpkgs-ccef3ab7d8762c6e5c75688dfd2d0850d9469a33.tar.zst nixpkgs-ccef3ab7d8762c6e5c75688dfd2d0850d9469a33.zip | |
Merge staging-next into staging
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) { |