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/tomcat: add aliases sub-option for virtual hosts #47224

Merged
merged 1 commit into from Oct 21, 2018

Conversation

pvgoran
Copy link
Contributor

@pvgoran pvgoran commented Sep 23, 2018

Motivation for this change

Specifying aliases is an essential part of the virtual host feature.

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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@Mic92
Copy link
Member

Mic92 commented Sep 23, 2018

cc @danbst

@danbst
Copy link
Contributor

danbst commented Sep 24, 2018

Probably rename to serverAliases, it will be then consistent with Nginx and Apache httpd. You may even copy description from there.

https://nixos.org/nixos/options.html#nginx+serveraliases
https://nixos.org/nixos/options.html#httpd+serveraliases

@pvgoran
Copy link
Contributor Author

pvgoran commented Sep 24, 2018

@danbst Consistency is good, but serverAliases would look rather out of place here, both semantically (why "server" if we're configuring a "virtual host"?) and stylistically (all other attributes here are short single words; nginx's and apache's virtual host configurations, on the contrary, use many multi-word attributes).

@danbst
Copy link
Contributor

danbst commented Sep 24, 2018

Alright, agreed. Good to go then!

@Mic92
Copy link
Member

Mic92 commented Sep 24, 2018

@GrahamcOfBorg test tomcat

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: tests.tomcat

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnfree = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnfree = true; }
to ~/.config/nixpkgs/config.nix.


@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: tests.tomcat

Partial log (click to expand)

server: exit status 0
client: running command: sync
client: exit status 0
test script finished in 31.45s
cleaning up
killing server (pid 597)
killing client (pid 609)
vde_switch: EOF on stdin, cleaning up and exiting
vde_switch: Could not remove ctl dir '/build/vde1.ctl': Directory not empty
/nix/store/bv3ccfy8jmrqmjl5n286hnprf631672a-vm-test-run-tomcat

@pvgoran
Copy link
Contributor Author

pvgoran commented Sep 29, 2018

ping @danbst @Mic92

@7c6f434c 7c6f434c merged commit 3491dd0 into NixOS:master Oct 21, 2018
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

5 participants