stack/monitor: fixes monitor password generation code

/reviewed-on nexedi/slapos!169

stack/monitor: fixes monitor password generation code
/reviewed-on nexedi/slapos!169
85de98bd · Hardik Juneja · Alain Takoudjou · 57c83f61 · 85de98bd · 85de98bd
Commit 85de98bd authored Jun 01, 2017 by Hardik Juneja Committed by Alain Takoudjou Jun 01, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 12 deletions

stack/monitor/buildout.hash.cfg stack/monitor/buildout.hash.cfg +1 -1

stack/monitor/instance-monitor.cfg.jinja2.in stack/monitor/instance-monitor.cfg.jinja2.in +4 -11

No files found.
--- a/stack/monitor/buildout.hash.cfg
+++ b/stack/monitor/buildout.hash.cfg
@@ -15,4 +15,4 @@
 # not need these here).
 [monitor2-template]
 filename = instance-monitor.cfg.jinja2.in
-md5sum = c963c43189a9b50e48ba27f2dd4e7b02
+md5sum = b829a49a28bd5997d786514c462bb9e1
--- a/stack/monitor/instance-monitor.cfg.jinja2.in
+++ b/stack/monitor/instance-monitor.cfg.jinja2.in
@@ -100,7 +100,7 @@ parameter-file-path = ${monitor-instance-parameter:configuration-file-path}

 parameter-list = 
  raw monitor-user ${monitor-instance-parameter:username}
-  htpasswd monitor-password ${monitor-htpassword-file:password-file} ${monitor-instance-parameter:username} ${httpd-monitor-htpasswd:htpasswd-path}
+  htpasswd monitor-password ${httpd-monitor-htpasswd:password-file} ${monitor-instance-parameter:username} ${httpd-monitor-htpasswd:htpasswd-path}
  file promise-timeout ${monitor-promise-timeout-file:file}
  file min-free-disk-MB ${promise-check-free-disk-space:config-file}
  ${monitor-instance-parameter:instance-configuration}
@@ -164,25 +164,18 @@ environment =
 recipe = slapos.cookbook:generate.password
 storage-path = ${directory:etc}/.monitor_pwd
 bytes = 8
-username = admin
-
-[monitor-htpassword-file]
-recipe = plone.recipe.command
-stop-on-error = true
-password-file = ${directory:etc}/.monitor_pwd
-command = 
-  if [ ! -s "${:password-file}" ]; then echo "${monitor-instance-parameter:password}" > ${:password-file}; fi
-update-command = ${:command}

 [httpd-monitor-htpasswd]
 recipe = plone.recipe.command
 stop-on-error = true
+password-file = ${directory:etc}/.monitor_pwd
 htpasswd-path = ${monitor-directory:etc}/monitor-htpasswd
 # Keep multiple lines as password can end with newline char.
 command = 
  if [ ! -s "${:htpasswd-path}" ]; then 
    {{ apache_location }}/bin/htpasswd -cb ${:htpasswd-path} ${:user} ${:password}
  fi
+  if [ ! -s "${:password-file}" ]; then echo "${monitor-instance-parameter:password}" > ${:password-file}; fi
 update-command = ${:command}
 user = ${monitor-instance-parameter:username}
 password = ${monitor-instance-parameter:password}
@@ -305,7 +298,7 @@ cors-domains = monitor.app.officejs.com
 collector-db = /srv/slapgrid/var/data-log/collector.db
 # Credentials
 password = ${monitor-htpasswd:passwd}
-username = ${monitor-htpasswd:username}
+username = admin
 # XXX: type key value
 # ex raw monitor-password resqdsdsd34
 instance-configuration =