Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nextcloud: 27.1.0 -> 27.1.2, update nginx, drop nextcloud25 #259967

Merged
merged 6 commits into from
Oct 13, 2023

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented Oct 9, 2023

Description of changes

Update was originally done by @f2k1de in #259348 (I applied their patch via git am -3, so author information is kept - I hope the way I did that is OK for you!)

Also added the following changes / fixes:

  • drop nc25 which will be EOL by the end of this month and shouldn't be part of 23.11.
  • updated the nginx config for 27.1.2 (ocm-provider isn't a directory anymore) and tried to clean it up a bit (see commit message for more details)
  • updated all nextcloud apps
  • dropped obsolete enableBrokenCiphersForSSE hack & openssl 1.1 support (not needed anymore, nc26 and later have a PHP-baked RC4 implementation for legacy SSE setups)

Deployed this to my own instance and tested via the web UI, Nextcloud client for file syncing & Cal/CardDAV without issues.

Closes #259348

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

f2k1de and others added 3 commits October 7, 2023 16:11
EOL of Nextcloud v25 is scheduled by the end of this month.
@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/` labels Oct 9, 2023
@SuperSandro2000
Copy link
Member

There is some reference left which we need to adjust/delete to fix the manual build.

@Ma27 Ma27 mentioned this pull request Oct 9, 2023
12 tasks
Ma27 added 2 commits October 9, 2023 12:40
First of all, a few cleanups were made to make it more readable:

* Reordered the sections by their priority so what you're reading in Nix
  is also what you get in the final nginx.conf.
* Unified media/asset locations

Most notably, this fixes the

    Your web server is not properly set up to resolve "/ocm-provider/".

warning since 27.1.2 where `ocm-provider` was moved from a static
directory in the source tarball to a dynamic HTTP route[1].

Additionally, the following things were fixed:

* The 404 checks for build/tests/etc. are now guaranteed to be before
  the `.php` location match and it's not implicitly relied upon Nix's
  internal attribute sorting anymore.

* `.wasm` files are supported properly and a correct `Content-Type` is
  set.

* For "legacy" routes (e.g. `ocs-provider`/`cron`/etc) a `rewrite` rule
  inside the location for fastcgi is used as recommended by upstream[2].
  This also makes it easier to understand the purpose of the location
  itself (i.e. use fastcgi for PHP code).

[1] nextcloud/documentation#11179
[2] https://docs.nextcloud.com/server/27/admin_manual/installation/nginx.html
@Ma27 Ma27 force-pushed the nextcloud-cleanups branch from fae8606 to ad57ad1 Compare October 9, 2023 10:41
@github-actions github-actions bot added 8.has: documentation This PR adds or changes documentation 8.has: changelog labels Oct 9, 2023
@cafkafk
Copy link
Member

cafkafk commented Oct 9, 2023

Result of nixpkgs-review pr 259967 run on x86_64-linux 1

1 package blacklisted:
  • nixos-install-tools
1 package built:
  • nextcloud27

nix-build -A nixosTests.nextcloud also ok

@ofborg ofborg bot requested review from globin and schneefux October 9, 2023 11:20
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 labels Oct 9, 2023
Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

deployed, the error on the admin page is cleared and so far everything continued to work

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Oct 9, 2023
@delroth delroth added 12.approvals: 2 This PR was reviewed and approved by two reputable people and removed 12.approvals: 1 This PR was reviewed and approved by one reputable person labels Oct 9, 2023
Copy link
Member

@bachp bachp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All checks passed

@delroth delroth added 12.approvals: 3+ This PR was reviewed and approved by three or more reputable people 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package and removed 12.approvals: 2 This PR was reviewed and approved by two reputable people labels Oct 9, 2023
@onny onny self-assigned this Oct 10, 2023
@onny onny self-requested a review October 10, 2023 09:02
@Ma27
Copy link
Member Author

Ma27 commented Oct 10, 2023

@onny any specific reason you have assigned this PR to you?
@RaitoBezarius any chance you have the capacity to review this?

Anyways, I think we have quite a good test coverage of this change now, so I'm inclined to merge soonish.

@RaitoBezarius
Copy link
Member

RaitoBezarius commented Oct 10, 2023 via email

@wegank wegank mentioned this pull request Oct 12, 2023
12 tasks
Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works as expected, plz merge

Copy link
Member

@RaitoBezarius RaitoBezarius left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can confirm that on my production deployment on 23.05, this works perfectly fine.
Didn't test everything through, but I think it's good to go.

@Ma27 Ma27 merged commit 35f6dbe into NixOS:master Oct 13, 2023
14 checks passed
@Ma27 Ma27 deleted the nextcloud-cleanups branch October 13, 2023 14:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog 8.has: clean-up 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes 12.approvals: 3+ This PR was reviewed and approved by three or more reputable people 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants