From 9627bf6a5ab1e5fbe5c124939ec3cc92d4e3ec63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Mang?= Date: Fri, 1 Feb 2019 08:53:50 +0100 Subject: [PATCH 1/5] Renamed configuration options --- src/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main.c b/src/main.c index 52a18a5..eda178f 100644 --- a/src/main.c +++ b/src/main.c @@ -57,14 +57,14 @@ static int mympd_inihandler(void *user, const char *section, const char *name, c #define MATCH(s, n) strcasecmp(section, s) == 0 && strcasecmp(name, n) == 0 - if (MATCH("mpd", "mpdhost")) { + if (MATCH("mpd", "host")) { free(p_config->mpdhost); p_config->mpdhost = strdup(value); } - else if (MATCH("mpd", "mpdport")) { + else if (MATCH("mpd", "port")) { p_config->mpdport = strtol(value, &crap, 10); } - else if (MATCH("mpd", "mpdpass")) { + else if (MATCH("mpd", "pass")) { free(p_config->mpdpass); p_config->mpdpass = strdup(value); } @@ -199,7 +199,7 @@ static void mympd_parse_env(struct t_config *config, const char *envvar) { } static void mympd_get_env(struct t_config *config) { - const char* env_vars[]={"MPD_MPDHOST", "MPD_MPDPORT", "MPD_STREAMPORT", + const char* env_vars[]={"MPD_HOST", "MPD_PORT", "MPD_PASS", "MPD_STREAMPORT", "WEBSERVER_WEBPORT", "WEBSERVER_SSL", "WEBSERVER_SSLPORT", "WEBSERVER_SSLCERT", "WEBSERVER_SSLKEY", "MYMPD_LOGLEVEL", "MYMPD_USER", "MYMPD_LOCALPLAYER", "MYMPD_COVERIMAGE", "MYMPD_COVERIMAGENAME", "MYMPD_COVERIMAGESIZE", "MYMPD_VARLIBDIR", "MYMPD_MIXRAMP", "MYMPD_STICKERS", "MYMPD_TAGLIST", From b80b4187b537ed46449bac1fdbc23648152252b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Mang?= Date: Fri, 1 Feb 2019 08:58:37 +0100 Subject: [PATCH 2/5] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index b94ee37..08e4b5b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,8 +25,8 @@ RUN tar -czvf /mympd.tar.gz -C /myMPD-dist . FROM library/debian:9-slim ENV MYMPD_LOGLEVEL=1 -ENV MPD_MPDHOST=127.0.0.1 -ENV MPD_MPDPORT=6600 +ENV MPD_HOST=127.0.0.1 +ENV MPD_PORT=6600 ENV WEBSERVER_SSL=true RUN apt-get update && apt-get install libssl-dev openssl -y COPY --from=build /libmpdclient-master.tar.gz / From 6a2e7c4ee8a188b1d28d6f6aefbe3b6f52b3bad7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Mang?= Date: Fri, 1 Feb 2019 08:59:18 +0100 Subject: [PATCH 3/5] Update compose --- contrib/docker/compose | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/docker/compose b/contrib/docker/compose index edde227..45b3bde 100644 --- a/contrib/docker/compose +++ b/contrib/docker/compose @@ -4,8 +4,8 @@ services: mympd: container_name: mympd # environment: -# MPD_MPDHOST: 192.168.1.1 -# MPD_MPDPORT: 6600 +# MPD_HOST: 192.168.1.1 +# MPD_PORT: 6600 # WEBSERVER_SSL: true # MYMPD_LOGLEVEL: 2 # image: mympd:latest From 13a09ac51885cd17bd369102eee02c2f2ae30fab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Mang?= Date: Fri, 1 Feb 2019 09:03:36 +0100 Subject: [PATCH 4/5] Update mympd.conf.dist --- contrib/mympd.conf.dist | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/mympd.conf.dist b/contrib/mympd.conf.dist index 3b587cf..25d477b 100644 --- a/contrib/mympd.conf.dist +++ b/contrib/mympd.conf.dist @@ -2,9 +2,9 @@ [mpd] #Connection to mpd -mpdhost = 127.0.0.1 -mpdport = 6600 -#mpdpass = +host = 127.0.0.1 +port = 6600 +#pass = #Port for mpd http stream streamport = 8000 From 401b9b4c8070b4b36dc198a73412cce838b0cb3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Mang?= Date: Fri, 1 Feb 2019 11:03:15 +0100 Subject: [PATCH 5/5] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 24d4acf..572e3e5 100644 --- a/README.md +++ b/README.md @@ -90,4 +90,5 @@ Copyright --------- myMPD: 2018-2019 + ympd: 2013-2014