[checkmk-commits] 7078 FIX Docker container: Don' t print missleading initial password with CMK_PASSWORD

Module: check_mk Branch: master Commit: 4404711fb4a3d916dd798e20527a26cd9824600a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4404711fb4a3d9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 28 23:42:07 2019 +0100 7078 FIX Docker container: Don't print missleading initial password with CMK_PASSWORD When using the environment option CMK_PASSWORD to set an initial password, the previous docker containers showed the default "welcome message" after site creation with a random initial password. The initial password was set afterwards leaving the missleading password in the log. The initial password is now set during site creation which makes the output don't show the wrong password anymore. Change-Id: I747cca73798b2ac052815440e96e686eb71ad434 --- .werks/7078 | 16 ++++++++++++++++ docker/docker-entrypoint.sh | 7 +------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.werks/7078 b/.werks/7078 new file mode 100644 index 0000000..f6c297c --- /dev/null +++ b/.werks/7078 @@ -0,0 +1,16 @@ +Title: Docker container: Don't print missleading initial password with CMK_PASSWORD +Level: 1 +Component: omd +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1548715130 +Class: fix + +When using the environment option CMK_PASSWORD to set an initial password, +the previous docker containers showed the default "welcome message" after +site creation with a random initial password. The initial password was set +afterwards leaving the missleading password in the log. + +The initial password is now set during site creation which makes the output +don't show the wrong password anymore. diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 985a2ee..b17e7fa 100755 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -34,18 +34,13 @@ fi # site tmpfs below tmp. if [ ! -d "/opt/omd/sites/$CMK_SITE_ID/etc" ] ; then echo "### CREATING SITE '$CMK_SITE_ID'" - omd create --no-tmpfs -u 1000 -g 1000 "$CMK_SITE_ID" + omd create --no-tmpfs -u 1000 -g 1000 --admin-password "$CMK_PASSWORD" "$CMK_SITE_ID" omd config "$CMK_SITE_ID" set APACHE_TCP_ADDR 0.0.0.0 omd config "$CMK_SITE_ID" set APACHE_TCP_PORT 5000 if [ "$CMK_LIVESTATUS_TCP" = "on" ]; then omd config "$CMK_SITE_ID" set LIVESTATUS_TCP on fi - - if [ -n "$CMK_PASSWORD" ]; then - echo "### SETTING PASSWORD OF 'cmkadmin'" - htpasswd -b -m "/omd/sites/$CMK_SITE_ID/etc/htpasswd" cmkadmin "$CMK_PASSWORD" - fi fi # In case of an update (see update procedure docs) the container is started