changed context doer to context user, fixed package config setting

This commit is contained in:
Danila Fominykh 2023-07-26 17:26:16 +03:00
parent 59bf7a7fcf
commit ab1a9a1587
No known key found for this signature in database
GPG Key ID: 1134F8EBF98AA06F
3 changed files with 4 additions and 3 deletions

View File

@ -83,6 +83,7 @@ func loadPackagesFrom(rootCfg ConfigProvider) (err error) {
Packages.LimitTotalOwnerSize = mustBytes(sec, "LIMIT_TOTAL_OWNER_SIZE") Packages.LimitTotalOwnerSize = mustBytes(sec, "LIMIT_TOTAL_OWNER_SIZE")
Packages.LimitSizeAlpine = mustBytes(sec, "LIMIT_SIZE_ALPINE") Packages.LimitSizeAlpine = mustBytes(sec, "LIMIT_SIZE_ALPINE")
Packages.LimitSizeArch = mustBytes(sec, "LIMIT_SIZE_ARCH")
Packages.LimitSizeCargo = mustBytes(sec, "LIMIT_SIZE_CARGO") Packages.LimitSizeCargo = mustBytes(sec, "LIMIT_SIZE_CARGO")
Packages.LimitSizeChef = mustBytes(sec, "LIMIT_SIZE_CHEF") Packages.LimitSizeChef = mustBytes(sec, "LIMIT_SIZE_CHEF")
Packages.LimitSizeComposer = mustBytes(sec, "LIMIT_SIZE_COMPOSER") Packages.LimitSizeComposer = mustBytes(sec, "LIMIT_SIZE_COMPOSER")

View File

@ -43,7 +43,7 @@ func Push(ctx *context.Context) {
// Save file related to arch package. // Save file related to arch package.
pkgid, err := arch_service.SaveFile(ctx, &arch_service.SaveFileParams{ pkgid, err := arch_service.SaveFile(ctx, &arch_service.SaveFileParams{
Creator: ctx.Doer, Creator: ctx.ContextUser,
Owner: ctx.Package.Owner, Owner: ctx.Package.Owner,
Metadata: md, Metadata: md,
Filename: filename, Filename: filename,
@ -59,7 +59,7 @@ func Push(ctx *context.Context) {
sigdata, err := hex.DecodeString(sign) sigdata, err := hex.DecodeString(sign)
if err == nil { if err == nil {
_, err = arch_service.SaveFile(ctx, &arch_service.SaveFileParams{ _, err = arch_service.SaveFile(ctx, &arch_service.SaveFileParams{
Creator: ctx.Doer, Creator: ctx.ContextUser,
Owner: ctx.Package.Owner, Owner: ctx.Package.Owner,
Metadata: md, Metadata: md,
Data: sigdata, Data: sigdata,

View File

@ -7,7 +7,7 @@
<label>{{svg "octicon-note"}} {{.locale.Tr "packages.arch.pacmanconf"}}</label> <label>{{svg "octicon-note"}} {{.locale.Tr "packages.arch.pacmanconf"}}</label>
<div class="markup"><pre class="code-block"><code>[{{.PackageDescriptor.Owner.LowerName}}.{{.RegistryHost}}] <div class="markup"><pre class="code-block"><code>[{{.PackageDescriptor.Owner.LowerName}}.{{.RegistryHost}}]
SigLevel = Optional TrustAll SigLevel = Optional TrustAll
Server = {{AppUrl}}api/packages/{{.PackageDescriptor.Owner.LowerName}}/arch/archlinux/x86_64</code></pre></div> Server = <gitea-origin-url data-url="{{AppSubUrl}}/api/packages/{{.PackageDescriptor.Owner.Name}}/arch/archlinux/x86_64"></gitea-origin-url></code></pre></div>
</div> </div>
<div class="field"> <div class="field">