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/samba: ensure global section is always first #341257

Merged
merged 1 commit into from
Sep 12, 2024

Conversation

bachp
Copy link
Member

@bachp bachp commented Sep 11, 2024

Description of changes

The order of the [global] section matters as settings defined there are only applied to shares that are defines after it.

This change ensures the global section always comes first in the resulting smb.conf.

Fixes regression introduced in #302681 (comment)

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Sep 11, 2024
@bachp bachp force-pushed the samba-global-section branch from 5ed1920 to 7868f54 Compare September 11, 2024 21:31
@bachp bachp changed the title nixos/samba: ensusre global section is always first nixos/samba: ensure global section is always first Sep 11, 2024
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Sep 12, 2024
Copy link
Contributor

@misuzu misuzu left a comment

Choose a reason for hiding this comment

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

Tested on my NAS, thanks!

nixos/modules/services/network-filesystems/samba.nix Outdated Show resolved Hide resolved
The order of the [global] section matters as settings
defined there are only applied to shares that are defines
after it.
@bachp bachp force-pushed the samba-global-section branch from 209e5bb to 1f06af9 Compare September 12, 2024 14:15
Copy link
Member

@anthonyroussel anthonyroussel left a comment

Choose a reason for hiding this comment

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

Thank you very much for your help!
Sorry I was not very available yesterday to fix that.

I tested the fix, it works perfectly!

services.samba = {
  enable = true;
  openFirewall = true;
  settings = {
    global = {
      "guest ok" = true;
    };
    "public" = {
      "path" = "/public";
      "browseable" = "yes";
      "comment" = "Public samba share.";
    };
    "Shared" = {
      "path" = "/private";
      "browseable" = "yes";
      "comment" = "Shared samba share.";
    };
  };
};

The Shared and public shares in this configuration are now allowing guest access.

@bachp bachp merged commit e7bcab8 into NixOS:master Sep 12, 2024
9 of 10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants