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/cassandra: Add cfg.extraEnvSh #98107

Merged
merged 1 commit into from Oct 7, 2020

Conversation

roberth
Copy link
Member

@roberth roberth commented Sep 16, 2020

Motivation for this change

Allow extending cassandra-env.sh, as is required when extending the classpath. This can be used for custom logging.

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.

@roberth
Copy link
Member Author

roberth commented Oct 6, 2020

@cransom could you have a look please?

@@ -38,13 +38,18 @@ let
cassandraYaml = builtins.toJSON cassandraConfigWithAddresses;
cassandraEnvPkg = "${cfg.package}/conf/cassandra-env.sh";
cassandraLogbackConfig = pkgs.writeText "logback.xml" cfg.logbackConfig;
passAsFile = [ "extraEnvSh" ];
inherit (cfg) extraEnvSh;
Copy link
Member

Choose a reason for hiding this comment

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

This is necessary for passAsFile? Or could you do passAsFile = [ "cfg.extraEnvSh" ];?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, those two lines pretty much sum up how it works.

It's documented in the Nix manual if you'd like to know more.

Copy link
Member

Choose a reason for hiding this comment

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

Ahh, right! The second line is required to make it an environment variable in the first place.

Copy link
Member

@JohnAZoidberg JohnAZoidberg left a comment

Choose a reason for hiding this comment

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

Looks good. Given that you provided an example, I assume you have tested it?

@roberth
Copy link
Member Author

roberth commented Oct 7, 2020

I assume you have tested it?

Yes I have and it works.

@roberth roberth merged commit 0504b01 into NixOS:master Oct 7, 2020
@roberth
Copy link
Member Author

roberth commented Oct 7, 2020

Thanks @JohnAZoidberg !

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

2 participants