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/lighttpd: misc improvements #27465

Merged
merged 3 commits into from Jul 29, 2017
Merged

Conversation

bjornfor
Copy link
Contributor

Motivation for this change

Mostly to get full mimetype list from upstream, but also misc improvements. See commits.

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@bjornfor, thanks for your PR! By analyzing the history of the files in this pull request, we identified @aszlig, @Phreedom and @edolstra to be potential reviewers.

@bjornfor
Copy link
Contributor Author

Hm, seems github lists the commits in AuthorDate order, not CommitDate. So the order is wrong. Oh well.

@bjornfor
Copy link
Contributor Author

@volth: Just because I like featureful defaults. And the closure size increase (28 -> 48 MiB) didn't seem that scary to me. If you and others dislike, I can remove that commit.

@grahamc
Copy link
Member

grahamc commented Jul 22, 2017

Yeah, I'd prefer see them continue defaulting to off.

@bjornfor
Copy link
Contributor Author

I removed the lighttpd: enable "magnet" and "mysql" support by default commit.

I'm merging in a few days unless other comments.

* mod_dirlisting is auto-loaded by lighttpd and should not be explicitly
  loaded in the configuration file.
* The rest comes from looking at "ls -1 $lighttpd/lib/*.so" when
  lighttpd is built with "enableMagnet" and "enableMysql".
Place them in $out/share/lighttpd/doc/config/.

Most importantly, this includes a complete set of mime types in the
$out/share/lighttpd/doc/config/conf.d/mime.conf file. The plan is to use
that file in the NixOS lighttpd module.
enableUpstreamMimeTypes controls whether to include the list of mime
types bundled with lighttpd (upstream). This option is enabled by
default and gives a much more complete mime type list than we currently
have. If you disable this, no mime types will be added by NixOS and you
will have to add your own mime types in services.lighttpd.extraConfig.
@bjornfor bjornfor merged commit aff0725 into NixOS:master Jul 29, 2017
@bjornfor bjornfor deleted the lighttpd-improvements branch July 29, 2017 12:29
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.

None yet

3 participants