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/acme: apply chmod and ownership unconditionally #81369

Merged
merged 1 commit into from Mar 7, 2020

Conversation

@mweinelt
Copy link
Member

mweinelt commented Feb 29, 2020

Also separate directory and file permissions so the certificate files
don't end up with the executable bit.

Fixes #81335

Motivation for this change

I believe this could address the issues I mentioned in #81335. This is completely untested, I will get to that later tonight.

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.

@aanderse @emilazy @flokli @Infinisil @arianvp @m1cr0man

Also separate directory and file permissions so the certificate files
don't end up with the executable bit.

Fixes #81335
@mweinelt mweinelt force-pushed the mweinelt:pr/acme-chmod branch from c7b273b to 3575555 Feb 29, 2020
Copy link
Member

emilazy left a comment

LGTM and passes tests locally, except for the one local change I had to make which I see you've beaten me to :)

@mweinelt
Copy link
Member Author

mweinelt commented Feb 29, 2020

Yup, tested it just now locally and stumbled on it myself. Otherwise looks to be working.

@yegortimoshenko
Copy link
Member

yegortimoshenko commented Mar 1, 2020

@GrahamcOfBorg test acme

@mweinelt mweinelt mentioned this pull request Mar 1, 2020
2 of 10 tasks complete
@Infinisil Infinisil merged commit 4f69262 into NixOS:master Mar 7, 2020
14 checks passed
14 checks passed
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="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
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.acme on aarch64-linux Success
Details
tests.acme on x86_64-linux Success
Details
Infinisil added a commit that referenced this pull request Mar 7, 2020
[20.03] nixos/acme: backport #81369 and #81371
@mweinelt mweinelt deleted the mweinelt:pr/acme-chmod branch Mar 7, 2020
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.