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/syncthing: keep manually added dirs/devices #198532

Merged
merged 1 commit into from
Nov 1, 2022
Merged

nixos/syncthing: keep manually added dirs/devices #198532

merged 1 commit into from
Nov 1, 2022

Conversation

raindev
Copy link
Contributor

@raindev raindev commented Oct 29, 2022

Description of changes

If folders and devices are not configured explicitly, do not wipe the changes done via the web GUI. Currently the list of devices or folders will be reset unless overrideFolders/overrideDevices is disabled.

Juding from #62157 this was the intention all along but the behaviour was changed unintentionally at a later point.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.11 Release Notes (or backporting 22.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@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 Oct 29, 2022
@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 Oct 29, 2022
If folders and devices are not configured explicitly, do not wipe the
changes done via the web GUI. Currently the list of devices or folders
will be reset unless overrideFolders/overrideDevices is disabled.
@raindev raindev marked this pull request as ready for review October 31, 2022 07:34
Copy link
Member

@ncfavier ncfavier left a comment

Choose a reason for hiding this comment

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

This disallows expressing that a machine should not have any configured devices, resp. folders, which I suppose is probably fine.

@raindev
Copy link
Contributor Author

raindev commented Nov 1, 2022

Thanks for having a look Naïm. I suppose it would be preferable to have overrideFolders and overrideDevices both false by default. This would allow to avoid the surprising behaviour of manually configured folders & devices disappearing while still allowing to enforce keeping the configured options, including empty. But changing the defaults would be backward incompatible of course.

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/1343

@SuperSandro2000 SuperSandro2000 merged commit 796cc1a into NixOS:master Nov 1, 2022
@raindev raindev deleted the syncthing-devices-folders branch November 2, 2022 07:13
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