diff options
| author | Jason Levine <levineja@mail.nih.gov> | 2017-02-27 09:38:16 -0500 |
|---|---|---|
| committer | Jason Levine <levineja@mail.nih.gov> | 2017-02-27 09:38:16 -0500 |
| commit | 09e12a6d4fc01f9252de5cbf869cfa55ea1aaf23 (patch) | |
| tree | 03d9460f30aca25e514593e1c43d4db350f2fa57 | |
| parent | bb427191b7923bc97775132182b8c3cd57646c35 (diff) | |
| download | munin-09e12a6d4fc01f9252de5cbf869cfa55ea1aaf23.tar.gz munin-09e12a6d4fc01f9252de5cbf869cfa55ea1aaf23.tar.bz2 munin-09e12a6d4fc01f9252de5cbf869cfa55ea1aaf23.tar.xz munin-09e12a6d4fc01f9252de5cbf869cfa55ea1aaf23.zip | |
fix readme to reflect need to quote command-line, space-separated username/password env vars
add backward compatibility for previous MUNIN_USER and MUNIN_PASSWORD env vars
| -rw-r--r-- | README.md | 4 | ||||
| -rwxr-xr-x | start-munin.sh | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -60,8 +60,8 @@ docker run -d \ -v /var/lib/munin:/var/lib/munin \ -v /var/run/munin:/var/run/munin \ -v /var/cache/munin:/var/cache/munin \ - -e MUNIN_USERS=http-user another-user \ - -e MUNIN_PASSWORDS=secret-password other-users-password \ + -e MUNIN_USERS='http-user another-user' \ + -e MUNIN_PASSWORDS='secret-password other-users-password' \ -e SMTP_HOST=smtp.example.com \ -e SMTP_PORT=587 \ -e SMTP_USERNAME=smtp-username \ diff --git a/start-munin.sh b/start-munin.sh index 4ab8e1c..fef4449 100755 --- a/start-munin.sh +++ b/start-munin.sh @@ -1,8 +1,8 @@ #!/bin/bash NODES=${NODES:-} SNMP_NODES=${SNMP_NODES:-} -MUNIN_USERS=${MUNIN_USERS:-user} -MUNIN_PASSWORDS=${MUNIN_PASSWORDS:-password} +MUNIN_USERS=${MUNIN_USERS:-${MUNIN_USER:-user}} +MUNIN_PASSWORDS=${MUNIN_PASSWORDS:-${MUNIN_PASSWORD:-password}} MAIL_CONF_PATH='/var/lib/munin/.mailrc' SMTP_USE_TLS=${SMTP_USE_TLS:-false} SMTP_ALWAYS_SEND=${SMTP_ALWAYS_SEND:-true} |