From b910210c9decd2da8cdd7899e7dee19eaaec4cff Mon Sep 17 00:00:00 2001 From: Groovylein Date: Sat, 18 Nov 2023 15:58:24 +0100 Subject: [PATCH] further update from upstream --- docker/config/docker.mpd.conf | 2 +- installation/includes/01_default_config.sh | 1 - installation/routines/customize_options.sh | 1 - resources/default-settings/jukebox.default.yaml | 12 +----------- 4 files changed, 2 insertions(+), 14 deletions(-) diff --git a/docker/config/docker.mpd.conf b/docker/config/docker.mpd.conf index f42611201..d8a91a780 100644 --- a/docker/config/docker.mpd.conf +++ b/docker/config/docker.mpd.conf @@ -83,7 +83,7 @@ user "root" # activation is in use. # # For network -bind_to_address "0.0.0.0" +bind_to_address "any" # # And for Unix Socket #bind_to_address "/run/mpd/socket" diff --git a/installation/includes/01_default_config.sh b/installation/includes/01_default_config.sh index 02401a630..eb6e45a91 100644 --- a/installation/includes/01_default_config.sh +++ b/installation/includes/01_default_config.sh @@ -11,7 +11,6 @@ DISABLE_SSH_QOS=true DISABLE_BOOT_SCREEN=true DISABLE_BOOT_LOGS_PRINT=true SETUP_MPD=true -UPDATE_RASPI_OS=false UPDATE_RASPI_OS=${UPDATE_RASPI_OS:-"true"} ENABLE_SAMBA=true ENABLE_WEBAPP=true diff --git a/installation/routines/customize_options.sh b/installation/routines/customize_options.sh index 87b102be0..d5ac7c547 100644 --- a/installation/routines/customize_options.sh +++ b/installation/routines/customize_options.sh @@ -269,7 +269,6 @@ Do you want to install Node? [Y/n]" 1>&3 fi } - customize_options() { echo "Customize Options starts" diff --git a/resources/default-settings/jukebox.default.yaml b/resources/default-settings/jukebox.default.yaml index 6330bc3f1..7120a95b4 100644 --- a/resources/default-settings/jukebox.default.yaml +++ b/resources/default-settings/jukebox.default.yaml @@ -11,8 +11,7 @@ modules: jingle: jingle jingle.alsawave: jingle.alsawave jingle.jinglemp3: jingle.jinglemp3 - player: playern.plugin - # spotify: playerspot + player: player.plugin cards: rfid.cards rfid: rfid.reader timers: timers @@ -92,15 +91,6 @@ playermpd: update_on_startup: true check_user_rights: true mpd_conf: ~/.config/mpd/mpd.conf -playerspot: - host: localhost - status_file: ../../shared/settings/spotify_player_status.json - collection_file: ../../shared/audiofolders/spotify/spotify_collection.yaml - second_swipe_action: - # Note: Does not follow the RPC alias convention (yet) - # Must be one of: 'toggle', 'play', 'skip', 'rewind', 'replay', 'none' - alias: toggle - spot_conf: ../../shared/spotify/config.toml" rpc: tcp_port: 5555 websocket_port: 5556