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

roundcube: Added new option maxAttachmentSize to configure max attachment size #92329

Merged
merged 2 commits into from Jul 8, 2020
Merged

roundcube: Added new option maxAttachmentSize to configure max attachment size #92329

merged 2 commits into from Jul 8, 2020

Conversation

asbachb
Copy link
Contributor

@asbachb asbachb commented Jul 5, 2020

Motivation for this change

Previously the attachment size was fixed to 18MB.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
$ git -c fetch.prune=false fetch --force https://github.com/NixOS/nixpkgs master:refs/nixpkgs-review/0
remote: Enumerating objects: 899, done.
remote: Counting objects: 100% (504/504), done.
remote: Compressing objects: 100% (113/113), done.
remote: Total 261 (delta 187), reused 192 (delta 133), pack-reused 0
Receiving objects: 100% (261/261), 46.02 KiB | 184.00 KiB/s, done.
Resolving deltas: 100% (187/187), completed with 95 local objects.
From https://github.com/NixOS/nixpkgs
   cda41cf743f..e0f07f9b8d7  master     -> refs/nixpkgs-review/0
$ git worktree add /home/asbachb/.cache/nixpkgs-review/rev-a7fd1e090903ae4ebac97d5f9dd7e3d01467bffb-dirty/nixpkgs e0f07f9b8d737eff6d7f90847f8360afc79fb90a
Preparing worktree (detached HEAD e0f07f9b8d7)
Updating files: 100% (22040/22040), done.
HEAD is now at e0f07f9b8d7 Merge pull request #63165 from CRTified/module/initrd-ovpn
$ nix-env -f /home/asbachb/.cache/nixpkgs-review/rev-a7fd1e090903ae4ebac97d5f9dd7e3d01467bffb-dirty/nixpkgs -qaP --xml --out-path --show-trace
No diff detected, stopping review...
$ git worktree prune
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@asbachb
Copy link
Contributor Author

asbachb commented Jul 5, 2020

/cc @Vskilet @globin @Ma27

@asbachb
roundcube: Added new option maxAttachmentSize to configure the maxi…
12e0d72 
…mum attachment size

The multiplication is used since roundcube uses only 70% of the php configured upload size.
@asbachb asbachb force-pushed the roundcube/add-message-size branch from a7fd1e0 to 12e0d72 Compare July 7, 2020 23:22
@asbachb asbachb requested a review from Ma27 July 7, 2020 23:24
@Ma27
nixos/manual: fix build
5bc22ad 
Option names must be `opt-<full-option-name>` in docbook XML.
@Ma27
Copy link
Member

Ma27 commented Jul 8, 2020

@asbachb lgtm, however I had to fix the manual build since you can only reference options using opt-services.roundcube.<roundcube-opt>.

To avoid this in the future, you can test the manual build like this:

$ nix build -L -f nixos/release.nix --arg supportedSystems '[ builtins.currentSystem ]' --builders '' manual

(I'd recommend to create a shell-alias for this btw)

Ma27
Ma27 approved these changes Jul 8, 2020
View reviewed changes
Copy link
Member

@Ma27 Ma27 left a comment

Choose a reason for hiding this comment

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

LGTM. Let's wait for ofborg, then I can merge this.

@asbachb
Copy link
Contributor Author

asbachb commented Jul 8, 2020

@Ma27 It there's no additional change request. Feel free to squash these commits into a single one.

@Ma27 Ma27 merged commit 87d7f0f into NixOS:master Jul 8, 2020
@Ma27
Copy link
Member

Ma27 commented Jul 8, 2020

@asbachb thanks!

@asbachb asbachb deleted the roundcube/add-message-size branch January 25, 2021 21:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ma27 Ma27 Ma27 approved these changes

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

Successfully merging this pull request may close these issues.

None yet
2 participants
@asbachb @Ma27