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

Added `trusted_proxies` setting to nextcloud #77480

Merged
merged 1 commit into from Jan 11, 2020

Conversation

@riotbib
Copy link
Contributor

@riotbib riotbib commented Jan 11, 2020

Motivation for this change

I have a nextcloud installation running on a NixOS platform but it is also proxied to get a static IP address. Nextcloud didn't allow tokens for login because of that. Nextcloud documentation says the setting trusted_proxies needs to be set. So I added that functionality. (I didn't test it live on that instance yet…)

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"
  • 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.

cc @Ma27

@Ma27 Ma27 self-requested a review Jan 11, 2020
@riotbib
Copy link
Contributor Author

@riotbib riotbib commented Jan 11, 2020

During that I asked myself if Line 388 ff of the module is really necessary. Maybe someone can help out? (First PR, new to all this…)

@Ma27
Copy link
Member

@Ma27 Ma27 commented Jan 11, 2020

@GrahamcOfBorg test nextcloud

@Ma27
Ma27 approved these changes Jan 11, 2020
@Ma27 Ma27 merged commit 4e6e944 into NixOS:master Jan 11, 2020
14 checks passed
14 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
tests.nextcloud on aarch64-linux Success
Details
tests.nextcloud on x86_64-linux Success
Details
@Ma27
Copy link
Member

@Ma27 Ma27 commented Jan 11, 2020

@riotbib thanks! (please note that I decided to modify the commit message to match our convention (which is <package>/<module>: <message>) as described in the contribution guidelines).

@fpletz do you recall why we still configured trusted domains imperatively, even after #63900? I'm not sure if there was a reason for this while we discussed about that change back then or I simply missed it 😅

dtzWill added a commit to dtzWill/nixpkgs that referenced this pull request Jan 11, 2020
@riotbib riotbib deleted the riotbib:submit/nc-trusted-proxies branch Jan 12, 2020
@riotbib
Copy link
Contributor Author

@riotbib riotbib commented Jan 12, 2020

@Ma27, great! My instance works like charme now. Thank you for merging!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.