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

Stekke
Copy link
Contributor

@Stekke Stekke 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
Member

@aanderse aanderse left a comment

Choose a reason for hiding this comment

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

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
nixos/modules/services/web-apps/dokuwiki.nix Show resolved Hide resolved
Even if the webserver had https disabled, the user would still get redirected to an https url when attemting to login.
@aanderse
Copy link
Member

aanderse commented Aug 2, 2020

@GrahamcOfBorg test dokuwiki

Copy link
Member

@aanderse aanderse left a comment

Choose a reason for hiding this comment

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

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!

@Stekke
Copy link
Contributor Author

Stekke commented Aug 2, 2020

Alright, thanks for the quick review :)

Copy link
Contributor

@dadada dadada left a comment

Choose a reason for hiding this comment

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

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

Copy link
Member

@1000101 1000101 left a comment

Choose a reason for hiding this comment

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

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
@aanderse
Copy link
Member

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 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
Member

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 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
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Login page timeout in dokuwiki module when no https
4 participants