colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #299811 from emilylange/forgejo-static-root-path 

forgejo: fix applying of our `STATIC_ROOT_PATH` patch
This commit is contained in:
Adam C. Stephens 2024-03-28 17:38:15 -04:00 committed by GitHub
parent 38482561f2 9fb68677e4
commit a0efbcae77
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/version-management/forgejo/default.nix
View File

@ -59,11 +59,11 @@ buildGoModule rec {
buildInputs = lib.optional pamSupport pam;
patches = [
./../gitea/static-root-path.patch
./static-root-path.patch
];
postPatch = ''
substituteInPlace modules/setting/setting.go --subst-var data
substituteInPlace modules/setting/server.go --subst-var data
'';
tags = lib.optional pamSupport "pam"

13
pkgs/applications/version-management/forgejo/static-root-path.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/modules/setting/server.go b/modules/setting/server.go
index 183906268..fa02e8915 100644
--- a/modules/setting/server.go
+++ b/modules/setting/server.go
@@ -319,7 +319,7 @@ func loadServerFrom(rootCfg ConfigProvider) {
OfflineMode = sec.Key("OFFLINE_MODE").MustBool()
Log.DisableRouterLog = sec.Key("DISABLE_ROUTER_LOG").MustBool()
if len(StaticRootPath) == 0 {
- StaticRootPath = AppWorkPath
+ StaticRootPath = "@data@"
}
StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString(StaticRootPath)
StaticCacheTime = sec.Key("STATIC_CACHE_TIME").MustDuration(6 * time.Hour)