diff options
| author | Bernardo Meurer <bernardo@meurer.org> | 2021-08-04 10:20:36 -0700 |
|---|---|---|
| committer | Bernardo Meurer <bernardo@meurer.org> | 2021-08-04 12:15:14 -0700 |
| commit | 3ccb633f85a6d1e7931e47206a85773ed9a67383 (patch) | |
| tree | c827268704ad79824c58627a53f2b15c29c7cfa2 | |
| parent | ade8623d559efc68b0fe399d4b3211aa4d71a7ab (diff) | |
| download | nixpkgs-3ccb633f85a6d1e7931e47206a85773ed9a67383.tar nixpkgs-3ccb633f85a6d1e7931e47206a85773ed9a67383.tar.gz nixpkgs-3ccb633f85a6d1e7931e47206a85773ed9a67383.tar.bz2 nixpkgs-3ccb633f85a6d1e7931e47206a85773ed9a67383.tar.lz nixpkgs-3ccb633f85a6d1e7931e47206a85773ed9a67383.tar.xz nixpkgs-3ccb633f85a6d1e7931e47206a85773ed9a67383.tar.zst nixpkgs-3ccb633f85a6d1e7931e47206a85773ed9a67383.zip | |
nixos/hqplayerd: use package-provided config file instead of blank
| -rw-r--r-- | nixos/modules/services/audio/hqplayerd.nix | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/nixos/modules/services/audio/hqplayerd.nix b/nixos/modules/services/audio/hqplayerd.nix index b4d8468a237..7d221e5b6de 100644 --- a/nixos/modules/services/audio/hqplayerd.nix +++ b/nixos/modules/services/audio/hqplayerd.nix @@ -115,25 +115,17 @@ in unitConfig.ConditionPathExists = [ configDir stateDir ]; - preStart = - let - blankCfg = pkgs.writeText "hqplayerd.xml" '' - <?xml version="1.0" encoding="utf-8"?> - <xml> - </xml> - ''; - in - '' - cp -r "${pkg}/var/lib/hqplayer/web" "${stateDir}" - chmod -R u+wX "${stateDir}/web" - - if [ ! -f "${configDir}/hqplayerd.xml" ]; then - echo "creating blank config file" - install -m 0644 "${blankCfg}" "${configDir}/hqplayerd.xml" - fi - '' + optionalString (cfg.auth.username != null && cfg.auth.password != null) '' - ${pkg}/bin/hqplayerd -s ${cfg.auth.username} ${cfg.auth.password} - ''; + preStart = '' + cp -r "${pkg}/var/lib/hqplayer/web" "${stateDir}" + chmod -R u+wX "${stateDir}/web" + + if [ ! -f "${configDir}/hqplayerd.xml" ]; then + echo "creating initial config file" + install -m 0644 "${pkg}/etc/hqplayer/hqplayerd.xml" "${configDir}/hqplayerd.xml" + fi + '' + optionalString (cfg.auth.username != null && cfg.auth.password != null) '' + ${pkg}/bin/hqplayerd -s ${cfg.auth.username} ${cfg.auth.password} + ''; serviceConfig = { ExecStart = "${pkg}/bin/hqplayerd"; |