fixup! Some clean-up in the monitor stack and its use in ERP5

Commit b96cdf9c didn't propagate
correctly the monitor password from the root partition to subpartitions.

stack/monitor/buildout.hash.cfg

@@ -14,4 +14,4 @@
 # not need these here).
 [monitor2-template]
 filename = instance-monitor.cfg.jinja2.in
-md5sum = e713bc55b68e3102f20902abc9f34f4b
+md5sum = c0856969ea372d49ab60ba07b3bf2a51

stack/monitor/instance-monitor.cfg.jinja2.in

@@ -97,7 +97,7 @@ parameter-file-path = ${monitor-instance-parameter:configuration-file-path}
 
 parameter-list =
   raw monitor-user ${monitor-instance-parameter:username}
-  htpasswd monitor-password ${monitor-htpasswd:storage-path} ${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 min-free-disk-MB ${promise-check-free-disk-space:config-threshold-file}
   ${monitor-instance-parameter:instance-configuration}
 # htpasswd entry:  htpasswd key password-file username htpasswd-file
@@ -142,18 +142,18 @@ wrapper-path = ${directory:scripts}/${:name}
 [monitor-htpasswd]
 recipe = slapos.cookbook:generate.password
 storage-path = ${directory:etc}/.monitor_pwd
-bytes = 8
 
 [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} ${monitor-instance-parameter:username} ${monitor-instance-parameter:password}
-  fi
-update-command = ${:command}
+  echo "${monitor-instance-parameter:password}" >${:password-file}
+  [ -s "${:htpasswd-path}" ] ||
+    {{ apache_location }}/bin/htpasswd -ci ${:htpasswd-path} "${monitor-instance-parameter:username}" <${:password-file}
+update-command =
+  [ -s "${:password-file}" ] || ${:command}
 
 [monitor-symlink]
 recipe = cns.recipe.symlink