Skip to content

[Backport release-24.11] nixos/matomo: fix service failure when not fully set up#374116

Merged
getchoo merged 2 commits intorelease-24.11from
backport-373894-to-release-24.11
Jan 16, 2025
Merged

[Backport release-24.11] nixos/matomo: fix service failure when not fully set up#374116
getchoo merged 2 commits intorelease-24.11from
backport-373894-to-release-24.11

Conversation

@nixpkgs-ci
Copy link
Contributor

@nixpkgs-ci nixpkgs-ci bot commented Jan 15, 2025 •
edited by getchoo
Loading

Bot-based backport to release-24.11, triggered by a label in #373894.

  • Before merging, ensure that this backport is acceptable for the release.
    • Even as a non-commiter, if you find that it is not acceptable, leave a comment.

osnyx added 2 commits January 15, 2025 18:06
@osnyx @github-actions
nixos/matomo: better check for database being set up
ddbe88f 
Since matomo-5.2.0, the config.php.ini is already created when first
accessing the installer page without completing it. This breaks our
discovery of whether to run database migrations.

Attempting to run DB migrations without provided database credentials
causes a crash -> causing matomo-setup-update.service to fail -> causing
phpfpm-matomo.service to fail.

(cherry picked from commit 10f670a)
@osnyx @github-actions
nixosTests.matomo: extend test coverage
a876e00 
(cherry picked from commit fc6d9cc)
@nixpkgs-ci nixpkgs-ci bot mentioned this pull request Jan 15, 2025
Merged
13 tasks
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jan 15, 2025
@getchoo getchoo added the 12.approvals: 2 This PR was reviewed and approved by two persons. label Jan 15, 2025
getchoo
getchoo reviewed Jan 15, 2025
View reviewed changes
@wegank wegank added 12.approvals: 1 This PR was reviewed and approved by one person. and removed 12.approvals: 2 This PR was reviewed and approved by two persons. labels Jan 15, 2025
@getchoo getchoo added 12.approvals: 2 This PR was reviewed and approved by two persons. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Jan 16, 2025
@getchoo getchoo merged commit 77b3fc9 into release-24.11 Jan 16, 2025
32 of 35 checks passed
@getchoo getchoo deleted the backport-373894-to-release-24.11 branch January 16, 2025 19:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@leona-ya leona-ya leona-ya approved these changes

@getchoo getchoo getchoo approved these changes

+1 more reviewer

@osnyx osnyx osnyx left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 12.approvals: 2 This PR was reviewed and approved by two persons.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@leona-ya @getchoo @osnyx @wegank