From ab1a9a1587da7bcd5f16e2140a67b8766da992a6 Mon Sep 17 00:00:00 2001 From: Danila Fominykh Date: Wed, 26 Jul 2023 17:26:16 +0300 Subject: [PATCH] changed context doer to context user, fixed package config setting --- modules/setting/packages.go | 1 + routers/api/packages/arch/arch.go | 4 ++-- templates/package/content/arch.tmpl | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/setting/packages.go b/modules/setting/packages.go index 5fbaaa0571..c4a4b96959 100644 --- a/modules/setting/packages.go +++ b/modules/setting/packages.go @@ -83,6 +83,7 @@ func loadPackagesFrom(rootCfg ConfigProvider) (err error) { Packages.LimitTotalOwnerSize = mustBytes(sec, "LIMIT_TOTAL_OWNER_SIZE") Packages.LimitSizeAlpine = mustBytes(sec, "LIMIT_SIZE_ALPINE") + Packages.LimitSizeArch = mustBytes(sec, "LIMIT_SIZE_ARCH") Packages.LimitSizeCargo = mustBytes(sec, "LIMIT_SIZE_CARGO") Packages.LimitSizeChef = mustBytes(sec, "LIMIT_SIZE_CHEF") Packages.LimitSizeComposer = mustBytes(sec, "LIMIT_SIZE_COMPOSER") diff --git a/routers/api/packages/arch/arch.go b/routers/api/packages/arch/arch.go index 6b1ddd62f5..66e4d92cad 100644 --- a/routers/api/packages/arch/arch.go +++ b/routers/api/packages/arch/arch.go @@ -43,7 +43,7 @@ func Push(ctx *context.Context) { // Save file related to arch package. pkgid, err := arch_service.SaveFile(ctx, &arch_service.SaveFileParams{ - Creator: ctx.Doer, + Creator: ctx.ContextUser, Owner: ctx.Package.Owner, Metadata: md, Filename: filename, @@ -59,7 +59,7 @@ func Push(ctx *context.Context) { sigdata, err := hex.DecodeString(sign) if err == nil { _, err = arch_service.SaveFile(ctx, &arch_service.SaveFileParams{ - Creator: ctx.Doer, + Creator: ctx.ContextUser, Owner: ctx.Package.Owner, Metadata: md, Data: sigdata, diff --git a/templates/package/content/arch.tmpl b/templates/package/content/arch.tmpl index d638f3daa6..07f967b5ac 100644 --- a/templates/package/content/arch.tmpl +++ b/templates/package/content/arch.tmpl @@ -7,7 +7,7 @@
[{{.PackageDescriptor.Owner.LowerName}}.{{.RegistryHost}}]
 SigLevel = Optional TrustAll
-Server = {{AppUrl}}api/packages/{{.PackageDescriptor.Owner.LowerName}}/arch/archlinux/x86_64
+Server =