From 09e12a6d4fc01f9252de5cbf869cfa55ea1aaf23 Mon Sep 17 00:00:00 2001
From: Jason Levine <levineja@mail.nih.gov>
Date: Mon, 27 Feb 2017 09:38:16 -0500
Subject: 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
---
README.md | 4 ++--
start-munin.sh | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index 7989a43..d32553d 100644
--- a/README.md
+++ b/README.md
@@ -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}
--
cgit v1.2.3