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.

Sign up for GitHub

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

Jump to bottom

nixos/prosody: support mod_http_file_share #171855

Merged
merged 1 commit into from
Jul 4, 2024
Merged

nixos/prosody: support mod_http_file_share #171855

merged 1 commit into from
Jul 4, 2024

Conversation

ju1m
Copy link
Contributor

@ju1m ju1m commented May 6, 2022 •
edited
Loading

Motivation for this change

Add some support for mod_http_file_share available with the new prosody 0.12.0. It's not at feature-parity with the old mod_http_upload, hence this proposal introduces a new httpFileShare group of options. freeformType is used for extensibility and we may want to type some options later on.

Things done
  • Add option services.prosody.httpFileShare
  • Add an entry in httpDiscoItems for cases where the domain is not a sub-domain of the main domain.
  • Fix xmppComplianceSuite assertion.
  • Document that httpUploadPath is only for mod_http_upload (mod_http_file_share stores in /var/lib/prosody/<escaped-component-name>/)
  • Tested only on my own prosody server and Gajim.
  • 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 via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.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.

@ju1m ju1m mentioned this pull request May 6, 2022
Closed
17 tasks
@ju1m ju1m requested a review from picnoir May 6, 2022 20:04
@ju1m
Copy link
Contributor Author

ju1m commented May 6, 2022

  • Fix infinite recursion when building the manual (nix -L build -f nixos/release-small.nix nixos.manual.x86_64-linux) by adding a custom description attribute to the freeformType of httpFileShareOpts.

@picnoir picnoir self-assigned this May 23, 2022
@ju1m
Copy link
Contributor Author

ju1m commented Nov 3, 2022

  • Fix conflicts due to mdDoc calls introduced by 2e751c0

@ju1m
Copy link
Contributor Author

ju1m commented Nov 4, 2022

  • Fix still missing mdDoc calls.

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/801

@ju1m ju1m requested a review from SuperSandro2000 June 8, 2023 20:23
@ju1m ju1m marked this pull request as draft June 8, 2023 20:28
@ju1m ju1m marked this pull request as ready for review June 8, 2023 20:40
SuperSandro2000
SuperSandro2000 reviewed Oct 13, 2023
View reviewed changes
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.

didn't test

nixos/modules/services/networking/prosody.nix Outdated Show resolved Hide resolved
nixos/modules/services/networking/prosody.nix Outdated Show resolved Hide resolved
nixos/modules/services/networking/prosody.nix Outdated Show resolved Hide resolved
nixos/modules/services/networking/prosody.nix Outdated Show resolved Hide resolved
@ju1m ju1m mentioned this pull request Nov 6, 2023
Open
12 tasks
@nyabinary
Copy link
Contributor

needs a rebase.

JohnRTitor
JohnRTitor previously requested changes Apr 26, 2024
View reviewed changes
Copy link
Contributor

@JohnRTitor JohnRTitor left a comment

Choose a reason for hiding this comment

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

Can you rebase this?

@AndersonTorres
Copy link
Member

PING

@ju1m
Copy link
Contributor Author

ju1m commented Jun 1, 2024

@JohnRTitor JohnRTitor dismissed their stale review July 4, 2024 16:29

changes addressed

@JohnRTitor JohnRTitor merged commit 9ec0508 into NixOS:master Jul 4, 2024
21 checks passed
@ju1m ju1m deleted the prosody branch July 5, 2024 12:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@JohnRTitor JohnRTitor JohnRTitor left review comments

@picnoir picnoir Awaiting requested review from picnoir

Assignees

@picnoir picnoir

Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 needs_merger
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@ju1m @nixos-discourse @nyabinary @AndersonTorres @SuperSandro2000 @JohnRTitor @picnoir