FS#80233 - [gitlab] wrong paths in puma.rb config

Attached to Project: Arch Linux
Opened by Jakub Klinkovský (lahwaacz) - Saturday, 11 November 2023, 18:16 GMT
Last edited by Caleb Maclennan (alerque) - Wednesday, 15 November 2023, 11:33 GMT
Task Type Bug Report
Category Packages: Extra
Status Closed
Assigned To Anatol Pomozov (anatolik)
Caleb Maclennan (alerque)
Architecture All
Severity Medium
Priority Normal
Reported Version
Due in Version Undecided
Due Date Undecided
Percent Complete 100%
Votes 1
Private No

Details

The commit [1] set wrong paths in puma.rb:

pidfile '/var/lib/gitlab/tmp/pids/puma.pid'
state_path '/var/lib/gitlab/tmp/pids/puma.state'

stdout_redirect '/var/lib/gitlab/log/puma.stdout.log',
'/var/lib/gitlab/log/puma.stderr.log',

The paths /var/lib/gitlab/tmp and /var/lib/gitlab/log don't exist and the PKGBUILD [2] actually sets _logdir=/var/log/gitlab
The previous paths were correct:

pidfile '/run/gitlab/puma.pid'
state_path '/run/gitlab/puma.state'

stdout_redirect '/var/log/gitlab/puma.stdout.log',
'/var/log/gitlab/puma.stderr.log',

[1] https://gitlab.archlinux.org/archlinux/packaging/packages/gitlab/-/commit/c8a09a08bf26079013916d3826710385ce277878
[2] https://gitlab.archlinux.org/archlinux/packaging/packages/gitlab/-/blob/main/PKGBUILD?ref_type=heads#L79
This task depends upon

Closed by  Caleb Maclennan (alerque)
Wednesday, 15 November 2023, 11:33 GMT
Reason for closing:  Fixed
Additional comments about closing:  Thanks for the assorted patches. There were a little bit hard to catch because my testing environment is an upgrade, not a new install, and hence using original config files not incoming updated ones.

Sorry neither of the patches here con credited in Git history because I was applying and editing them manually, but they were appreciated, even if some bits were still wrong in the patch ;-)

16.6.0 is out but has build issues a the moment, so a pkgrel of 16.5.x is going out with this stuff included shortly.
Comment by loqs (loqs) - Saturday, 11 November 2023, 18:30 GMT
Is this the same issue as  FS#80077  and possibly  FS#80129 ?
Comment by Jakub Klinkovský (lahwaacz) - Saturday, 11 November 2023, 18:35 GMT
https://bugs.archlinux.org/task/80077 did not result in fixing the paths in the packaged puma.rb file.

sidekiqctl is unrelated, that issue is already fixed.
Comment by loqs (loqs) - Saturday, 11 November 2023, 18:41 GMT
Do you have a diff that resolves the path issue?
Comment by Jakub Klinkovský (lahwaacz) - Saturday, 11 November 2023, 19:07 GMT
The diff is attached.

There is also a typo in https://gitlab.archlinux.org/archlinux/packaging/packages/gitlab/-/blob/main/gitlab-configs.patch?ref_type=heads#L266 which makes gitlab-backup.service fail: "gilab" should be "gitlab"
   puma.rb.diff (0.6 KiB)
Comment by loqs (loqs) - Saturday, 11 November 2023, 20:55 GMT
I think the attached diff has converted those changes to changes in gitlab-configs.patch. Linked is the build I generated with the diff applied. Please see if this appears correct.

https://drive.google.com/file/d/1c0nbV4-PvP_bWxBd1Nu8uARv-m66aFjz/view?usp=sharing gitlab-16.5.1-2.1-x86_64.pkg.tar.zst
   PKGBUILD.diff (1.8 KiB)
Comment by Toolybird (Toolybird) - Sunday, 12 November 2023, 20:54 GMT
Merging  FS#80218  here

Loading...