mirror of https://github.com/SuperBFG7/ympd
Merge branch 'master' of https://github.com/jcorporation/myMPD
This commit is contained in:
commit
81f93d6f82
|
@ -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 /
|
||||
|
|
|
@ -90,4 +90,5 @@ Copyright
|
|||
---------
|
||||
|
||||
myMPD: 2018-2019 <mail@jcgames.de>
|
||||
|
||||
ympd: 2013-2014 <andy@ndyk.de>
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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",
|
||||
|
|
Loading…
Reference in New Issue