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

nixos/dokuwiki: fix https redirect #94551

Merged
merged 1 commit into from Aug 3, 2020
Merged

nixos/dokuwiki: fix https redirect #94551

merged 1 commit into from Aug 3, 2020

Conversation

@StijnDW
Copy link
Contributor

@StijnDW StijnDW commented Aug 2, 2020

Even if the webserver had https disabled, the user would still get redirected to an https url when attemting to login.
This fixes #94550

Motivation for this change

Fixes broken login behavior when https is disabled.

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.
Copy link
Contributor

@aanderse aanderse left a comment

What do you do for dns? For our internal sites I use dns challenge with let's encrypt to provision ssl certificates and it's dead simple. I would highly recommend this over the alternative (though I still approve this PR 👍).

Also I'm a huge fan of your avatar 😄

nixos/modules/services/web-apps/dokuwiki.nix Outdated Show resolved Hide resolved
@StijnDW StijnDW force-pushed the StijnDW:dokuwiki branch from 13298a0 to dabfcfa Aug 2, 2020
Even if the webserver had https disabled, the user would still get redirected to an https url when attemting to login.
@StijnDW StijnDW force-pushed the StijnDW:dokuwiki branch from dabfcfa to f7b6bfd Aug 2, 2020
@aanderse
Copy link
Contributor

@aanderse aanderse commented Aug 2, 2020

@GrahamcOfBorg test dokuwiki

Copy link
Contributor

@aanderse aanderse left a comment

LGTM 👍

Hopefully we can get a quick approval from @1000101 or @dadada in the next few days. If not, ping me back and we'll merge.

Thanks!

@StijnDW
Copy link
Contributor Author

@StijnDW StijnDW commented Aug 2, 2020

Alright, thanks for the quick review :)

@dadada
dadada approved these changes Aug 3, 2020
Copy link
Contributor

@dadada dadada left a comment

I support this change in addition to adding a test StijnDW#1

@1000101
1000101 approved these changes Aug 3, 2020
Copy link
Member

@1000101 1000101 left a comment

I basically agree with what @aanderse said. Just for the record, I was thinking about dropping the current SSL configuration altogether as it's imposing a given configuration on the user rather than leaving it up to him/her: #83769 (comment)

@dadada I think we should also document this service in the 20.09 release notes as the service changed from single-site to multi-site and this may break existing configuration.

@aanderse aanderse merged commit 34298f0 into NixOS:master Aug 3, 2020
17 checks passed
17 checks passed
tests tests
Details
tests
Details
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="f7b6bfd"; rev="f7b6bfd113572e8b037bc701e898d78ae6c40104"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="f7b6bfd"; rev="f7b6bfd113572e8b037bc701e898d78ae6c40104"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="f7b6bfd"; rev="f7b6bfd113572e8b037bc701e898d78ae6c40104"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="f7b6bfd"; rev="f7b6bfd113572e8b037bc701e898d78ae6c40104"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="f7b6bfd"; rev="f7b6bfd113572e8b037bc701e898d78ae6c40104"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="f7b6bfd"; rev="f7b6bfd113572e8b037bc701e898d78ae6c40104"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="f7b6bfd"; rev="f7b6bfd113572e8b037bc701e898d78ae6c40104"; } ./pkgs/t
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.dokuwiki on aarch64-linux Success
Details
tests.dokuwiki on x86_64-linux Success
Details
@aanderse
Copy link
Contributor

@aanderse aanderse commented Aug 3, 2020

@dadada & @StijnDW feel free to ping me on the follow-up PR. Thanks!
@1000101 sounds good. Are you going to take care of that?

@1000101
Copy link
Member

@1000101 1000101 commented Aug 3, 2020

@1000101 sounds good. Are you going to take care of that?

You mean the documentation or dropping SSL forcing?

@aanderse
Copy link
Contributor

@aanderse aanderse commented Aug 3, 2020

Either or. I'm simply hoping that the action items will have someone to follow-up on them 😄

@1000101
Copy link
Member

@1000101 1000101 commented Aug 3, 2020

Either or. I'm simply hoping that the action items will have someone to follow-up on them smile

Ok, I did both :) #94609.

@dadada dadada mentioned this pull request Aug 3, 2020
3 of 10 tasks complete
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.

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