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

PlaceNixConfiguration: don't write ssl-cert-file to nix.custom.conf if determinate and macOS #1440

Merged
merged 1 commit into from
Feb 14, 2025

Conversation

cole-h
Copy link
Member

@cole-h cole-h commented Feb 14, 2025

determinate-nixd will handle the ssl-cert-file setting in its managed nix.conf, which will override the ssl-cert-file that may already be configured in the user's nix.custom.conf.

This is NOT TRUE for non-Determinate installs, since the !include nix.custom.conf statement is at the bottom of nix.conf on non-Determinate installs, meaning it will override whatever is set in nix.conf; for Determinate installs, the include statement is at the top of nix.conf, meaning the Determinate-managed config will override anything set in the nix.custom.conf (such as ssl-cert-file).

Description
Checklist
  • Formatted with cargo fmt
  • Built with nix build
  • Ran flake checks with nix flake check
  • Added or updated relevant tests (leave unchecked if not applicable)
  • Added or updated relevant documentation (leave unchecked if not applicable)
  • Linked to related issues (leave unchecked if not applicable)
Validating with install.determinate.systems

If a maintainer has added the upload to s3 label to this PR, it will become available for installation via install.determinate.systems:

curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix/pr/$PR_NUMBER | sh -s -- install

… if determinate and macOS

determinate-nixd will handle the `ssl-cert-file` setting in its managed
nix.conf, which will override the `ssl-cert-file` that may already be
configured in the user's nix.custom.conf.

This is _NOT TRUE_ for non-Determinate installs, since the `!include
nix.custom.conf` statement is at the _bottom_ of nix.conf on
non-Determinate installs, meaning it will override whatever is set in
nix.conf; for Determinate installs, the include statement is at the
_top_ of nix.conf, meaning the Determinate-managed config will override
anything set in the nix.custom.conf (such as `ssl-cert-file`).
@cole-h cole-h added this to the 0.36.4 milestone Feb 14, 2025
@cole-h cole-h enabled auto-merge (squash) February 14, 2025 19:47
@cole-h cole-h merged commit 268c44c into main Feb 14, 2025
22 checks passed
@cole-h cole-h deleted the cole/fh-617 branch February 14, 2025 20:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants