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/nextcloud: fix inclusion of trusted_domains in override config #65299

Merged
merged 1 commit into from Jul 24, 2019
Merged

nixos/nextcloud: fix inclusion of trusted_domains in override config #65299

merged 1 commit into from Jul 24, 2019

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented Jul 23, 2019 •
edited

Motivation for this change

Regression I caused with 3944aa0, sorry
for this! The Nextcloud installer broke back then because
trusted_domains was an empty value by default (a.k.a an empty array)
which seemed to break the config merger of Nextcloud as Nextcloud
doesn't do recursive merging and now no domain was trusted because of
that (the empty array for trusted_domains was used), hence Nextcloud was unreachable for the curl call.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-review wip"
  • 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.

@Ma27 Ma27 changed the title nixos/nextcloud: fix inclusion of trusted_domains in override config WIP nixos/nextcloud: fix inclusion of trusted_domains in override config Jul 23, 2019
@Ma27
nixos/nextcloud: fix inclusion of trusted_domains in override config
c5e515f 
Regression I caused with 3944aa0, sorry
for this! The Nextcloud installer broke back then because
`trusted_domains` was an empty value by default (a.k.a an empty array)
which seemed to break the config merger of Nextcloud as Nextcloud
doesn't do recursive merging and now no domain was trusted because of
that, hence Nextcloud was unreachable for the `curl` call.
@Ma27 Ma27 changed the title WIP nixos/nextcloud: fix inclusion of trusted_domains in override config nixos/nextcloud: fix inclusion of trusted_domains in override config Jul 23, 2019
@Ma27
Copy link
Member Author

Ma27 commented Jul 23, 2019

@GrahamcOfBorg test nextcloud.with-postgresql-and-redis nextcloud.basic nextcloud.with-mysql-and-memcached

@globin globin merged commit 5806e71 into NixOS:master Jul 24, 2019
@Ma27 Ma27 deleted the fix-nextcloud-test branch July 24, 2019 19:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Ma27 @globin