reflect the changes done in !169 to other parts of the code

/reviewed-on nexedi/slapos!175

software/apache-frontend/buildout.hash.cfg

@@ -19,11 +19,11 @@ md5sum = f686f765e55d1dce2e55a400f0714b3e
 
 [template-apache-frontend]
 filename = instance-apache-frontend.cfg
-md5sum = 465360ab5ff2c3be3c9902205cabee31
+md5sum = 979eecabeaad0114fb24f65bf52f7e6a
 
 [template-apache-replicate]
 filename = instance-apache-replicate.cfg.in
-md5sum = 9b17c835bcd927269cf510bf612f5985
+md5sum = c55506cfb92d87f915d50d32fb129a28
 
 [template-slave-list]
 filename = templates/apache-custom-slave-list.cfg.in

software/apache-frontend/instance-apache-frontend.cfg

@@ -613,7 +613,7 @@ extra_slave_instance_list =
 frontend-name =
 monitor-cors-domains =
 monitor-httpd-port = 8072
-monitor-username = $${monitor-htpasswd:username}
+monitor-username = $${monitor-instance-parameter:username}
 monitor-password = $${monitor-htpasswd:passwd}
 
 #######
@@ -655,7 +655,7 @@ extra-context =
 template = ${template-wrapper:output}
 rendered = $${monitor-directory:reports}/monitor-apache-server-status-wrapper
 mode = 0700
-command = ${curl:location}/bin/curl -s http://$${instance-parameter:ipv4-random}:$${instance-parameter:configuration.plain_http_port}/server-status -u $${monitor-htpasswd:username}:$${monitor-htpasswd:passwd} 2>&1 
+command = ${curl:location}/bin/curl -s http://$${instance-parameter:ipv4-random}:$${instance-parameter:configuration.plain_http_port}/server-status -u $${monitor-instance-parameter:username}:$${monitor-htpasswd:passwd} 2>&1
 extra-context =
   key content monitor-apache-server-status-wrapper:command
 

software/apache-frontend/instance-apache-replicate.cfg.in

@@ -81,7 +81,7 @@ context =
 <= slap-connection
 recipe = slapos.cookbook:requestoptional
 config-monitor-cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }}
-config-monitor-username = ${monitor-htpasswd:username}
+config-monitor-username = ${monitor-instance-parameter:username}
 config-monitor-password = ${monitor-htpasswd:passwd}
 
 {% set frontend_software_url_key = "-frontend-software-release-url" %}

software/kvm/common.cfg

@@ -107,7 +107,7 @@ recipe = hexagonit.recipe.download
 ignore-existing = true
 url = ${:_profile_base_location_}/instance-kvm-cluster.cfg.jinja2.in
 mode = 644
-md5sum = 2a3d44d23f35224495af7a84c96b4324
+md5sum = 1ba26b796f1bc509889c8a34296b1b19
 download-only = true
 on-update = true
 

software/kvm/instance-kvm-cluster.cfg.jinja2.in

@@ -80,7 +80,7 @@ config-data-to-vm = {{ dumps(kvm_parameter_dict.get('data-to-vm', '')) }}
 config-disable-ansible-promise = {{ dumps(kvm_parameter_dict.get('disable-ansible-promise', False)) }}
 config-enable-monitor = {{ enable_monitoring }}
 config-monitor-cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }}
-config-monitor-username = ${monitor-htpasswd:username}
+config-monitor-username = ${monitor-instance-parameter:username}
 config-monitor-password = ${monitor-htpasswd:passwd}
 
 # Enable simple http server on ipv6 so all VMs will access it
@@ -235,7 +235,7 @@ username = admin
 [monitor-instance-parameter]
 monitor-httpd-port = 8060
 cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }}
-username = ${monitor-htpasswd:username}
+username = ${monitor-instance-parameter:username}
 password = ${monitor-htpasswd:passwd}
 
 [monitor-conf-parameters]

software/powerdns/instance-powerdns-replicate.cfg.jinja2

@@ -81,7 +81,7 @@ username = admin
 [monitor-instance-parameter]
 monitor-httpd-port = 8099
 cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }}
-username = ${monitor-htpasswd:username}
+username = ${monitor-instance-parameter:username}
 password = ${monitor-htpasswd:passwd}
 
 [monitor-conf-parameters]
@@ -109,7 +109,7 @@ config-{{parameter}} = {{ value }}
 {% endfor -%}
 config-{{ slave_list_name }} = {{ json_module.dumps(slave_instance_list) }}
 config-monitor-cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.node.vifib.com') }}
-config-monitor-username = ${monitor-htpasswd:username}
+config-monitor-username = ${monitor-instance-parameter:username}
 config-monitor-password = ${monitor-htpasswd:passwd}
 
 [publish-information]

software/powerdns/software.cfg

@@ -38,7 +38,7 @@ mode = 640
 [template-dns-replicate]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-powerdns-replicate.cfg.jinja2
-md5sum = 57e3010389031eb1a403820c1e9769d5
+md5sum = 3699d0751632e0c11b466342789e27a3
 mode = 0644
 
 [iso-list]

software/slaprunner/buildout.hash.cfg

@@ -27,7 +27,7 @@ md5sum = 40e839e76d03fabefb1859ea72383529
 
 [instance-runner-import]
 filename = instance-runner-import.cfg.in
-md5sum = 5d49f4fe6de7bd02db0067d0aeac6de4
+md5sum = 44c029ac2e30930d3017fb9503a77e36
 
 [template-runner-export-script]
 filename = template/runner-export.sh.jinja2

software/slaprunner/instance-runner-import.cfg.in

@@ -156,7 +156,7 @@ auto-deploy-instance = false
 auto-deploy = true
 name = Webrunner import
 monitor-cors-domains = 
-monitor-username = $${monitor-htpasswd:username}
+monitor-username = $${monitor-instance-parameter:username}
 monitor-password = $${monitor-htpasswd:passwd}
 
 [resilient-publish-connection-parameter]

stack/monitor/README.md

@@ -38,7 +38,7 @@ Override monitor configuration section to define your custom parameters.
     cors-domains = monitor.app.officejs.com
     collector-db = ...
     password = ${monitor-htpasswd:passwd}
-    username = ${monitor-htpasswd:username}
+    username = admin
     instance-configuration = ...
     configuration-file-path = ...
     interface-url = ...
@@ -57,7 +57,7 @@ You don't need to define all parameters, you can only set what is required to be
 - monitor-url-list: set list of Monitor Base URL of monitor sub-instances, if this is the root instance with at least one child.
 - cors-domains: the domain used by the monitor web interface. The default is: monitor.app.officejs.com.
 - username: monitor username, this should be the same in all sub-instances. Default is: admin.
-- password: monitor password, this should be the same in all sub-instances. Default is generated (${monitor-htpasswd:username}).
+- password: monitor password, this should be the same in all sub-instances. Default is generated (${monitor-instance-parameter:username}).
 - instance-configuration: instance custom information or configuration to show in monitor web interface. There is many possibility:
   raw CONFIG_KEY VALUE => non editable configuration, ie: raw monitor-password resqdsdsd34
   file CONFIG_KEY PATH_TO_RESULT_FILE => editable configuration.
@@ -218,7 +218,7 @@ Parameters can be editable (except raw parameter) directly from  monitor interfa
     [monitor-instance-parameter]
     instance-configuration = 
       raw init-user ${publish-connection-information:init-user}
-      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}
 
 The user will see parameters: