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

Jump to bottom

shairport-sync: set sysconfdir to /etc/ #61133

Merged
merged 1 commit into from May 24, 2019
Merged

shairport-sync: set sysconfdir to /etc/ #61133

merged 1 commit into from May 24, 2019

Conversation

flokli
Copy link
Contributor

@flokli flokli commented May 8, 2019

since 2.8.5, shairport-sync uses the directory path sysconfdir to
determine where to place the configuration file shairport-sync.conf.

This led to shairport-sync complaining at startup:

configuration file name "/nix/store/i8gb0hsb2zczdl8g1h73pbcb952585l9-shairport-sync-3.2.2/etc/shairport-sync.conf" can not be resolved.

Looking for a configuration file there doesn't make much sense, as we'd
have to include configuration in the shairport-sync derivation itself.

By setting sysconfdir to /etc/, shairport-sync will try to read its
configuration from /etc/shairport-sync.conf, which is a more sane
default.

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@flokli
shairport-sync: set sysconfdir to /etc/
de05f6f 
since 2.8.5, shairport-sync uses the directory path sysconfdir to
determine where to place the configuration file shairport-sync.conf.

This led to shairport-sync complaining at startup:
> configuration file name "/nix/store/i8gb0hsb2zczdl8g1h73pbcb952585l9-shairport-sync-3.2.2/etc/shairport-sync.conf" can not be resolved.

Looking for a configuration file there doesn't make much sense, as we'd
have to include configuration in the shairport-sync derivation itself.

By setting sysconfdir to /etc/, shairport-sync will try to read its
configuration from /etc/shairport-sync.conf, which is a more sane
default.
@flokli flokli requested a review from fpletz May 8, 2019 10:13
@flokli
Copy link
Contributor Author

flokli commented May 8, 2019

shouldn't hurt to backport this to 19.03 either ;-)

@ofborg ofborg bot requested a review from LnL7 May 8, 2019 10:30
@fpletz fpletz merged commit 32c25b4 into NixOS:master May 24, 2019
@flokli
Copy link
Contributor Author

flokli commented May 24, 2019

backported to 19.03 in f70e66c.

@flokli flokli deleted the shairport-sync-configfile branch May 24, 2019 21:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fpletz fpletz Awaiting requested review from fpletz

@LnL7 LnL7 Awaiting requested review from LnL7

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@flokli @fpletz